Index: sources/gui/qml/pages/settings/SettingsStack.qml
===================================================================
diff -u -r9c7a790376d07de7ddaa67e39d47102d68693c87 -r0e122c98700951af539d9f47c5578e26d640fcc7
--- sources/gui/qml/pages/settings/SettingsStack.qml	(.../SettingsStack.qml)	(revision 9c7a790376d07de7ddaa67e39d47102d68693c87)
+++ sources/gui/qml/pages/settings/SettingsStack.qml	(.../SettingsStack.qml)	(revision 0e122c98700951af539d9f47c5578e26d640fcc7)
@@ -51,8 +51,8 @@
         RoInput             ,
         Language            ,
         Calibration         ,
-        DeviceRegistration  ,
         DeviceConfiguration ,
+        DeviceRegistration  ,
         SWUpdate            ,
         FactoryReset
     }
@@ -68,8 +68,8 @@
         qsTr("Water Input Mode"             ), // RoInput
         qsTr("Set Language"                 ), // Language
         qsTr("Calibration "                 ), // Calibration
-        qsTr("Device Registration"          ), // DeviceRegistration
         qsTr("Device Configuration"         ), // Manufacturing Setup
+        qsTr("Device Registration"          ), // DeviceRegistration
         qsTr("Software Update"              ), // SWUpdate
         qsTr("Factory Reset"                ), // FactoryReset
     ]
@@ -85,8 +85,8 @@
         true                                 , // RoInput
         false                                , // Language
         false                                , // Calibration
-        true                                 , // DeviceRegistration
         _GuiView.manufactSetup               , // Manufacturing Setup
+        true                                 , // DeviceRegistration
         false                                , // SWUpdate
         serviceMode                                , // FactoryReset
     ]
@@ -102,10 +102,10 @@
       ! _GuiView.manufactSetup               , // RoInput
         false /* serviceMode phase 1 */      , // Language
         false /* serviceMode phase 1 */      , // Calibration
-        _GuiView.manufactSetup               , // DeviceRegistration
-        serviceMode && _GuiView.manufactSetup, // Manufacturing Setup
+        _GuiView.manufactSetup && serviceMode, // Manufacturing Setup // && serviceMode added to make sure the service mode is confirmed by HD
+        _GuiView.manufactSetup && serviceMode, // DeviceRegistration  // && serviceMode added to make sure the service mode is confirmed by HD
         false /* serviceMode phase 1 */      , // SWUpdate
-        serviceMode /* serviceMode phase 1 */      , // FactoryReset
+        serviceMode                          , // FactoryReset
     ]
 
     SettingsHome { id   : _settingsHome
@@ -176,7 +176,6 @@
         }
     }
 
-    SettingsManufacturingSetup  { id: _settingsDeviceConfiguration  }
     SettingsInformation         { id: _settingsInformation          }
     SettingsVolumeBrightness    { id: _settingsVolumeBrightness     }
     SettingsDateTime            { id: _settingsDateTime             }
@@ -185,6 +184,7 @@
     SettingsDG                  { id: _settingsDGSettings           }
     SettingsExportLogs          { id: _settingsExportLogs           }
     SettingsROInput             { id: _settingsRoInput              }
+    SettingsManufacturingSetup  { id: _settingsDeviceConfiguration  }
     SettingsDeviceRegistration  { id: _settingsDeviceRegistration   }
     SettingsServicePassword     { id: _servicePassword              }