Index: sources/gui/qml/pages/settings/SettingsStack.qml
===================================================================
diff -u -r934354462a353ff5e7fc2ddfe6f3a8f0121a8f3f -r6bff7fae4c7b28a493b5824598c669fa8ab920b3
--- sources/gui/qml/pages/settings/SettingsStack.qml	(.../SettingsStack.qml)	(revision 934354462a353ff5e7fc2ddfe6f3a8f0121a8f3f)
+++ sources/gui/qml/pages/settings/SettingsStack.qml	(.../SettingsStack.qml)	(revision 6bff7fae4c7b28a493b5824598c669fa8ab920b3)
@@ -71,8 +71,7 @@
     readonly property bool visibleInstitutionalRecord   :   true
     readonly property bool visibleLocalization          :                            true // loggedIn TODO:
 
-    readonly property string settingsTitle              : _GuiView.manufactSetup ? qsTr("Manufacturing Setup")  : serviceMode
-                                                                                 ? qsTr("Service")              : _GuiView.updateSetup
+    readonly property string settingsTitle              : _GuiView.manufactSetup ? qsTr("Manufacturing Setup")  : _GuiView.updateSetup
                                                                                  ? qsTr("Software Update")      : qsTr("Device Settings")
 
     enum ItemsIndex {
@@ -156,6 +155,9 @@
         visibleInstitutionalRecord          , // Institutional Record
     ]
 
+    // TODO: SRS 405/406 Test Mode instead add Q_PROPERTY to monitor state???
+    onServiceModeChanged:  _headerBar.loggedUser = serviceMode ? "[Service]" : ""
+
     SettingsHome { id   : _settingsHome
         backVisible     : false
         //TODO  on graceful shutdown, the applicaiton quit shall be used for any applicaiton termination
@@ -315,12 +317,8 @@
         function onManufactModeChanged( vPass ) {
             if ( _GuiView.manufactMode )  {
                 vSettings.checkServicePasswordSet()
-                stackView.initialItem =  _servicePassword
+                push(_servicePassword)
             }
-            else {
-                stackView.initialItem = _settingsHome
-            }
-            push(stackView.initialItem)
 
             //DEBUG console.log (" 1 ---------- ", _GuiView.manufactMode, _GuiView.manufactSetup, vPass, stackView.initialItem, stackView.currentItem, stackView.depth)
             if ( _GuiView.manufactSetup ) {
@@ -331,7 +329,6 @@
             if ( _GuiView.UpdateMode )  {
                 stackView.initialItem = _settingsHome
             }
-            push(stackView.initialItem)
 
             //DEBUG console.log (" 1 ---------- ", _GuiView.manufactMode, _GuiView.manufactSetup, vPass, stackView.initialItem, stackView.currentItem, stackView.depth)
             if ( _GuiView.updateSetup ) {