diff --git a/Step/wwwroot/src/components/maintenance.ts b/Step/wwwroot/src/components/maintenance.ts
index c891e79d..d33bd610 100644
--- a/Step/wwwroot/src/components/maintenance.ts
+++ b/Step/wwwroot/src/components/maintenance.ts
@@ -97,6 +97,7 @@ export default class Maintenance extends Vue {
 
     public createMaintenance(){
         this.selectedMaintenanceId = null;
+        this.enableMaintenance = true;
         ModalHelper.maintenanceModal.currentMaintenance = {};
         ModalHelper.ShowModal(CreateMaintenance);
     }
@@ -110,7 +111,7 @@ export default class Maintenance extends Vue {
         debugger
         await this.getNoteMaintenance(m);
         this.enableMaintenance = false;
-        this.selectedMaintenanceId = m.id;
+        this.selectedMaintenanceId = m.id;        this.selectedMaintenanceId = m.id;
     }
     public modifyMaintenance(maintenance){
         if(maintenance){
diff --git a/Step/wwwroot/src/modules/create-maintenance.vue b/Step/wwwroot/src/modules/create-maintenance.vue
index 435e4312..d2cc5789 100644
--- a/Step/wwwroot/src/modules/create-maintenance.vue
+++ b/Step/wwwroot/src/modules/create-maintenance.vue
@@ -4,8 +4,8 @@
     <div class="typology">
         <label class="typology_lbl">{{'create_maintenance_lbl_typology' | localize("Tipologia")}}</label>
         <div class="radiobutton">
-            <input type="radio" id="datefixed" name="radio-group" v-model="newMaintenance.type" value="EXP_DATE"><label for="datefixed">Data Fissa</label>
-            <input type="radio" id="time" name="radio-group" v-model="newMaintenance.type" value="TIME_INTERVAL"><label for="time">Temporale</label>
+            <input type="radio" v-validate.initial="'required'" id="datefixed" name="radio-group" v-model="newMaintenance.type" value="EXP_DATE"><label for="datefixed">Data Fissa</label>
+            <input type="radio" v-validate.initial="'required'" id="time" name="radio-group" v-model="newMaintenance.type" value="TIME_INTERVAL"><label for="time">Temporale</label>
         </div>
     </div>
         <div class="title">
@@ -41,7 +41,7 @@
     <footer>
       <div class="pull-right">
         <button class="btn" @click="close()">{{'create_maintenance_btn_cancel' | localize("Annulla")}}</button>
-        <button class="btn btn-success" @click="newMaintenance.id > 0 ? modify(newMaintenance) : save(newMaintenance)">{{'create_maintenance_btn_confirm' | localize("Conferma")}}</button>
+        <button class="btn btn-success" :disabled="!isValid" @click="newMaintenance.id > 0 ? modify(newMaintenance) : save(newMaintenance)">{{'create_maintenance_btn_confirm' | localize("Conferma")}}</button>
       </div>
     </footer>
   </modal>