diff --git a/resources/machines/ultimaker_original.json b/resources/machines/ultimaker_original.json
index ca3ea7f3e3..6ea8d65cee 100644
--- a/resources/machines/ultimaker_original.json
+++ b/resources/machines/ultimaker_original.json
@@ -71,10 +71,8 @@
         },
         "machine_end_gcode": {
             "default": "M104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300  ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 X-20 Y-20 F9000 ;move Z up a bit and retract filament even more\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\nM84 ;steppers off\nG90 ;absolute positioning"
-        }
-    },
+        },
 
-    "overrides": {
-        "material_bed_temperature": { "visible": false }
+        "machine_extruder_drive_upgrade": { "default": false }
     }
 }
diff --git a/resources/qml/WizardPages/SelectUpgradedParts.qml b/resources/qml/WizardPages/SelectUpgradedParts.qml
index 167c110a70..4275defdbf 100644
--- a/resources/qml/WizardPages/SelectUpgradedParts.qml
+++ b/resources/qml/WizardPages/SelectUpgradedParts.qml
@@ -46,21 +46,25 @@ Item
             id: checkBox
             text: catalog.i18nc("@option:check","Extruder driver ugrades")
             checked: true
+            onClicked: UM.MachineManager.setMachineSettingValue("machine_extruder_drive_upgrade", true);
         }
         CheckBox
         {
             text: catalog.i18nc("@option:check","Heated printer bed (standard kit)")
             y: checkBox.height * 1
+            onClicked: UM.MachineManager.setMachineSettingValue("machine_heated_bed", true)
         }
         CheckBox
         {
             text: catalog.i18nc("@option:check","Heated printer bed (self built)")
             y: checkBox.height * 2
+            onClicked: UM.MachineManager.setMachineSettingValue("machine_heated_bed", true)
         }
         CheckBox
         {
             text: catalog.i18nc("@option:check","Dual extrusion (experimental)")
             y: checkBox.height * 3
+            enabled: false;
         }
     }
 
@@ -74,4 +78,4 @@ Item
     }
 
     ExclusiveGroup { id: printerGroup; }
-}
\ No newline at end of file
+}