diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/riscaldi-inferiori.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/riscaldi-inferiori.vue
index 2b01eadf..4aeca48d 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/riscaldi-inferiori.vue
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/riscaldi-inferiori.vue
@@ -3,12 +3,12 @@
 		<aside class="scrollable auto" v-if="recipe">
 			<div class="box transparent">
 				<div class="body">
-					<template v-if="recipe.heats_lowerheaters_enabled.status.visible">
-						<div class="input-area">
-							<label>{{'heats_lowerheaters_enabled'|localize('Abilitazione riscaldo')}}</label>
+					<template v-if="recipe.heats_lowerheaters_movement_enabled.status.visible">
+						<div>
+							<label>{{'heats_lowerheaters_movement_enabled'|localize('Movimento')}}</label>
 							<toggle-button
-								v-model="recipe.heats_lowerheaters_enabled.setpointHMI"
-								:status="recipe.heats_lowerheaters_enabled.status"
+								v-model="recipe.heats_lowerheaters_movement_enabled.setpointHMI"
+								:status="recipe.heats_lowerheaters_movement_enabled.status"
 							></toggle-button>
 						</div>
 					</template>
@@ -80,12 +80,12 @@
 								></toggle-button>
 							</div>
 						</template>
-						<template v-if="recipe.heats_lowerheaters_movement_enabled.status.visible">
-							<div>
-								<label>{{'heats_lowerheaters_movement_enabled'|localize('Movimento')}}</label>
+						<template v-if="recipe.heats_lowerheaters_enabled.status.visible">
+							<div class="input-area">
+								<label>{{'heats_lowerheaters_enabled'|localize('Abilitazione riscaldo')}}</label>
 								<toggle-button
-									v-model="recipe.heats_lowerheaters_movement_enabled.setpointHMI"
-									:status="recipe.heats_lowerheaters_movement_enabled.status"
+									v-model="recipe.heats_lowerheaters_enabled.setpointHMI"
+									:status="recipe.heats_lowerheaters_enabled.status"
 								></toggle-button>
 							</div>
 						</template>
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/riscaldi-superiori.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/riscaldi-superiori.vue
index f1a6ebd6..49c535d7 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/riscaldi-superiori.vue
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/riscaldi/components/base-components/riscaldi-superiori.vue
@@ -3,12 +3,12 @@
 		<aside class="scrollable auto" v-if="recipe">
 			<div class="box transparent">
 				<div class="body">
-					<template v-if="recipe.heats_upperheaters_enabled.status.visible">
-						<div class="input-area">
-							<label>{{'heats_upperheaters_enabled'|localize('Abilitazione riscaldo')}}</label>
+					<template v-if="recipe.heats_upperheaters_movement_enabled.status.visible">
+						<div>
+							<label>{{'heats_upperheaters_movement_enabled'|localize('Movimento')}}</label>
 							<toggle-button
-								v-model="recipe.heats_upperheaters_enabled.setpointHMI"
-								:status="recipe.heats_upperheaters_enabled.status"
+								v-model="recipe.heats_upperheaters_movement_enabled.setpointHMI"
+								:status="recipe.heats_upperheaters_movement_enabled.status"
 							></toggle-button>
 						</div>
 					</template>
@@ -80,12 +80,12 @@
 								></toggle-button>
 							</div>
 						</template>
-						<template v-if="recipe.heats_upperheaters_movement_enabled.status.visible">
-							<div>
-								<label>{{'heats_upperheaters_movement_enabled'|localize('Movimento')}}</label>
+						<template v-if="recipe.heats_upperheaters_enabled.status.visible">
+							<div class="input-area">
+								<label>{{'heats_upperheaters_enabled'|localize('Abilitazione riscaldo')}}</label>
 								<toggle-button
-									v-model="recipe.heats_upperheaters_movement_enabled.setpointHMI"
-									:status="recipe.heats_upperheaters_movement_enabled.status"
+									v-model="recipe.heats_upperheaters_enabled.setpointHMI"
+									:status="recipe.heats_upperheaters_enabled.status"
 								></toggle-button>
 							</div>
 						</template>