Index: sources/gui/qml/pages/settings/SettingsStack.qml
===================================================================
diff -u -r0e122c98700951af539d9f47c5578e26d640fcc7 -rc73feffa73c7fe073a7a7581144f5806dfc91beb
--- sources/gui/qml/pages/settings/SettingsStack.qml	(.../SettingsStack.qml)	(revision 0e122c98700951af539d9f47c5578e26d640fcc7)
+++ sources/gui/qml/pages/settings/SettingsStack.qml	(.../SettingsStack.qml)	(revision c73feffa73c7fe073a7a7581144f5806dfc91beb)
@@ -35,7 +35,7 @@
 StackItem { id : _root
     objectName: "_SettingsStack"
 
-    stackView.initialItem   : _GuiView.manufactSetup ? _servicePassword : _settingsHome
+    stackView.initialItem   : null
 
     property bool   serviceMode : false
 
@@ -68,44 +68,44 @@
         qsTr("Water Input Mode"             ), // RoInput
         qsTr("Set Language"                 ), // Language
         qsTr("Calibration "                 ), // Calibration
-        qsTr("Device Configuration"         ), // Manufacturing Setup
+        qsTr("Device Configuration"         ), // Device Configuration
         qsTr("Device Registration"          ), // DeviceRegistration
         qsTr("Software Update"              ), // SWUpdate
         qsTr("Factory Reset"                ), // FactoryReset
     ]
     property var itemsEnabled  : [
-        true                                 , // Information
-        true                                 , // VolumeBrightness
-        true                                 , // WiFi
-        true                                 , // Bluetooth
-        true                                 , // DGSettings
-        true                                 , // ServicePassword
-        true                                 , // SetDateTime
-        true                                 , // ExportLogs
-        true                                 , // RoInput
-        false                                , // Language
-        false                                , // Calibration
-        _GuiView.manufactSetup               , // Manufacturing Setup
-        true                                 , // DeviceRegistration
-        false                                , // SWUpdate
-        serviceMode                                , // FactoryReset
+        true                                    , // Information
+        true                                    , // VolumeBrightness
+        true                                    , // WiFi
+        true                                    , // Bluetooth
+        true                                    , // DGSettings
+        true                                    , // ServicePassword
+        true                                    , // SetDateTime
+        true                                    , // ExportLogs
+        true                                    , // RoInput
+        false                                   , // Language
+        false                                   , // Calibration
+        _GuiView.manufactMode                   , // Device Configuration
+        true                                    , // DeviceRegistration
+        false                                   , // SWUpdate
+        serviceMode                             , // FactoryReset
     ]
     property var itemsVisible  : [
-        true                                 , // Information
-        true                                 , // VolumeBrightness
-        true                                 , // WiFi
-        true                                 , // Bluetooth
-      ! _GuiView.manufactSetup               , // DGSettings
-      ! serviceMode                          , // ServicePassword
-        serviceMode                          , // SetDateTime
-      ! _GuiView.manufactSetup               , // ExportLogs
-      ! _GuiView.manufactSetup               , // RoInput
-        false /* serviceMode phase 1 */      , // Language
-        false /* serviceMode phase 1 */      , // Calibration
-        _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                          , // FactoryReset
+        true                                    , // Information
+        true                                    , // VolumeBrightness
+        true                                    , // WiFi
+        true                                    , // Bluetooth
+      ! _GuiView.manufactSetup                  , // DGSettings
+      ! serviceMode && ! _GuiView.manufactSetup , // ServicePassword
+        serviceMode                             , // SetDateTime
+        true                                    , // ExportLogs
+      ! _GuiView.manufactSetup                  , // RoInput
+        false /* serviceMode phase 1 */         , // Language
+        false /* serviceMode phase 1 */         , // Calibration
+        _GuiView.manufactMode && serviceMode    , // Device Configuration  // && serviceMode added to make sure the service mode is confirmed by HD
+        _GuiView.manufactMode && serviceMode    , // DeviceRegistration    // && serviceMode added to make sure the service mode is confirmed by HD
+        false /* serviceMode phase 1 */         , // SWUpdate
+        serviceMode                             , // FactoryReset
     ]
 
     SettingsHome { id   : _settingsHome
@@ -214,6 +214,24 @@
         function onStandbyWaitDisinfectChanged      ( vValue ) { page( _settingsHome                    , vValue  )}
     }
 
+    Connections { target: _GuiView
+        function onManufactModeChanged( vPass ) {
+            if ( _GuiView.manufactMode )  {
+                vSettings.checkServicePasswordSet()
+                stackView.initialItem =  _servicePassword
+            }
+            else {
+                stackView.initialItem = _settingsHome
+            }
+            push(stackView.initialItem)
+
+            //DEBUG console.log (" ----------",_GuiView.manufactMode, _GuiView.manufactSetup, vPass, stackView.initialItem, stackView.currentItem, stackView.depth)
+            if ( _GuiView.manufactSetup ) {
+                _settingsHome.notificationText = vPass ? "" : qsTr("Application POST Failed")
+            }
+        }
+    }
+
     onVisibleChanged: {
         if (visible) {
             _mainMenu.hidden = serviceMode || _GuiView.manufactSetup