Index: sources/gui/qml/pages/MainStack.qml
===================================================================
diff -u -r828e0b187e2fa3f75d769938bede41ef34683493 -r9c7a790376d07de7ddaa67e39d47102d68693c87
--- sources/gui/qml/pages/MainStack.qml	(.../MainStack.qml)	(revision 828e0b187e2fa3f75d769938bede41ef34683493)
+++ sources/gui/qml/pages/MainStack.qml	(.../MainStack.qml)	(revision 9c7a790376d07de7ddaa67e39d47102d68693c87)
@@ -38,6 +38,8 @@
     // DEBUG: this property can mostly be used for debugging to get pass the initial screen
     property var initialItem: _postModeScreen
 
+    property var _startupScreen: _GuiView.manufactSetup ? _settingsStack : _mainHome
+
     stackView.initialItem   : _root.initialItem
 
     // Standby / Disinfection
@@ -56,12 +58,6 @@
     // Post Treatment
     PostTreatmentStack              { id: _postTreatmentStack               }
 
-    ScreenItem { id: _faultModeScreen
-        // we recently decided to not change the screen on fault and stay on current(whatever are we on currently) screen.
-        PlaceHolderText { screenName: qsTr("FAULT  MODE") }
-        onVisibleChanged: if (visible) _mainMenu.hidden = true
-    }
-
     ScreenItem { id: _serviceModeScreen
         PlaceHolderText { screenName: qsTr("SERVICE  MODE") }
         onVisibleChanged: if (visible) _mainMenu.hidden = true
@@ -134,7 +130,7 @@
             //               "vHDOperationMode.fault"  , vHDOperationMode  .fault      ,
             //               "vHDOperationMode.opMode" , vHDOperationMode  .opMode     )
             if ( vSettings.noCANBus ) {
-                page( _mainHome ,
+                page( _startupScreen ,
                      vHDOperationMode.fault ||      // in fault mode
                      vHDOperationMode.init  ||      // in initial post mode
                      vHDOperationMode.opMode === 0  // has not even been initialized , which most probably is the case.
@@ -148,13 +144,13 @@
         function onIsManagerChanged             ( vValue ) { if( vValue ) _mainMenu.isManager  ()                }
         function onIsSettingsChanged            ( vValue ) { if( vValue ) _mainMenu.isSettings ()                }
 
-        function onFaultChanged                 ( vValue ) { page( _mainHome                        , vValue    )}
-        function onServiceChanged               ( vValue ) { page( _serviceModeScreen               , vValue    )}
+        function onFaultChanged                 ( vValue ) { page( _startupScreen                   , vValue    )}
+        function onServiceChanged               ( vValue ) {                                                     }
         function onInitChanged                  ( vValue ) { page( _postModeScreen                  , vValue    && ! vSettings.noCANBus  )
                                                              if( vValue ) vHDPOSTData.reset() // better to reset on vinit = true because the rest makes the screen animation to run
         }
 
-        function onHomeChanged                  ( vValue ) { page( _mainHome                        , vValue    )}
+        function onHomeChanged                  ( vValue ) { page( _startupScreen                   , vValue    )}
         function onStandbyChanged               ( vValue ) { /* It depends on the subModes of the standBy. Handled by onHome.  */   }
         function onStandbyStartChanged          ( vValue ) { /* It depends on the subModes of the standBy. Handled by onHome.  */   }
         function onStandbyWaitTreatmentChanged  ( vValue ) { /* It depends on the subModes of the standBy. Handled by onHome.  */   }