diff --git a/cura/Settings/CuraContainerRegistry.py b/cura/Settings/CuraContainerRegistry.py
index 11c4cf2d4a..6ce87aafea 100644
--- a/cura/Settings/CuraContainerRegistry.py
+++ b/cura/Settings/CuraContainerRegistry.py
@@ -424,23 +424,23 @@ class CuraContainerRegistry(ContainerRegistry):
         extruder_stack.addMetaDataEntry("position", "0")
         extruder_stack.setNextStack(machine)
 
-        # if machine.userChanges:
-        #     # set existing user changes if found
-        #     extruder_stack.setUserChanges(machine.userChanges)
-        # else:
-        #     # create empty user changes container otherwise
-        #     user_container = InstanceContainer(extruder_stack.getId() + "_user")
-        #     user_container.addMetaDataEntry("type", "user")
-        #     user_container.addMetaDataEntry("machine", extruder_stack.getId())
-        #     from cura.CuraApplication import CuraApplication
-        #     user_container.addMetaDataEntry("setting_version", CuraApplication.SettingVersion)
-        #     user_container.setDefinition(extruder_definition)
-        #     extruder_stack.setUserChanges(user_container)
-        #     self.addContainer(user_container)
+        if machine.userChanges:
+            # set existing user changes if found
+            extruder_stack.setUserChanges(machine.userChanges)
+        else:
+            # create empty user changes container otherwise
+            user_container = InstanceContainer(extruder_stack.getId() + "_user")
+            user_container.addMetaDataEntry("type", "user")
+            user_container.addMetaDataEntry("machine", extruder_stack.getId())
+            from cura.CuraApplication import CuraApplication
+            user_container.addMetaDataEntry("setting_version", CuraApplication.SettingVersion)
+            user_container.setDefinition(extruder_definition)
+            extruder_stack.setUserChanges(user_container)
+            self.addContainer(user_container)
 
         # extruder_stack.setVariantById("default")
-        # extruder_stack.setMaterialById("default")
-        # extruder_stack.setQualityById("default")
+        extruder_stack.setMaterialById("default")
+        extruder_stack.setQualityById("default")
 
         self.addContainer(extruder_stack)
 
diff --git a/cura/Settings/CuraStackBuilder.py b/cura/Settings/CuraStackBuilder.py
index b9fbbc43f0..57eefa0397 100644
--- a/cura/Settings/CuraStackBuilder.py
+++ b/cura/Settings/CuraStackBuilder.py
@@ -51,7 +51,7 @@ class CuraStackBuilder:
 
         if not extruder_definition:
             # create extruder stack for single extrusion machines that have no separate extruder definition files
-            extruder_definition = registry.findDefinitionContainers(id = "fdmextruder")
+            extruder_definition = registry.findDefinitionContainers(id = "fdmextruder")[0]
             new_extruder_id = registry.uniqueName(machine_definition.getId() + " " + "fdmextruder")
             new_extruder = cls.createExtruderStack(
                 new_extruder_id,
diff --git a/resources/definitions/fdmextruder.def.json b/resources/definitions/fdmextruder.def.json
index 8ed194fc2d..ada35fafe0 100644
--- a/resources/definitions/fdmextruder.def.json
+++ b/resources/definitions/fdmextruder.def.json
@@ -8,7 +8,8 @@
         "author": "Ultimaker",
         "manufacturer": "Unknown",
         "setting_version": 1,
-        "visible": false
+        "visible": false,
+        "position": "0"
     },
     "settings":
     {