Index: sources/gui/qml/pages/settings/SettingsStack.qml
===================================================================
diff -u -r39a514158384c0ad4bfcfb90bafbaa4ca8dc5a26 -r72550dbbd6db8eab40aad38956b32f99416600c8
--- sources/gui/qml/pages/settings/SettingsStack.qml	(.../SettingsStack.qml)	(revision 39a514158384c0ad4bfcfb90bafbaa4ca8dc5a26)
+++ sources/gui/qml/pages/settings/SettingsStack.qml	(.../SettingsStack.qml)	(revision 72550dbbd6db8eab40aad38956b32f99416600c8)
@@ -62,7 +62,7 @@
     //                                                  if works it is a better approach better.
     readonly property bool visibleServicePassword       : ( normalMode          && ! loggedIn ) // || ( onlyUpdating &&    ! loggedIn )
     readonly property bool visibleDGCleaning            :   normalMode
-    readonly property bool visibleRoInput               :   normalMode
+    readonly property bool visibleRoInput               :   onlyManufacturing   &&  loggedIn
     readonly property bool visibleRootSSHAccess         :                           loggedIn
     readonly property bool visibleFactoryReset          :                           loggedIn
     readonly property bool visibleDecommission          :   false   // TODO: Not Yet Defined
@@ -153,7 +153,7 @@
     ]
 
     // TODO: SRS 405/406 Test Mode instead add Q_PROPERTY to monitor state???
-    onServiceModeChanged:  _headerBar.userMode = serviceMode ? "[Service]" : ""
+    onServiceModeChanged:  _headerBar.userMode = serviceMode ? "Service" : ""
 
     SettingsHome { id   : _settingsHome
         itemIndex       : SettingsStack.Home