Index: main.cpp
===================================================================
diff -u -raf8d98b36b427e2b5f4d6659fcf3b58ee79eab6a -rd3412ddbb51dca3768ce29182d331e5274e9e745
--- main.cpp	(.../main.cpp)	(revision af8d98b36b427e2b5f4d6659fcf3b58ee79eab6a)
+++ main.cpp	(.../main.cpp)	(revision d3412ddbb51dca3768ce29182d331e5274e9e745)
@@ -97,7 +97,6 @@
 bool        gConsoleoutFrameInterface   = false ;
 bool        gConsoleoutCanInterface     = false ;
 
-bool        gBypassFault                = false ;
 bool        gEnableDryDemo              = false ;
 QString     gActiveCANBus               = "can0";
 
@@ -247,11 +246,6 @@
                                           QCoreApplication::translate("main", "CANBus"));
     parser.addOption(optionActiveCANBus);
 
-    // --- -F : disable-fault-screen
-    QCommandLineOption optionBypassFault(QStringList() << "F" << "disable-fault-screen",
-                                           QCoreApplication::translate("main", "Enables UI to navigate to Home/Standby on fault"));
-    parser.addOption(optionBypassFault);
-
     // --- parse command lines
     parser.process(*qApp);
 
@@ -268,7 +262,6 @@
     gEnableCheckInLog           = parser.isSet(optionEnableCheckInLog           );
     gEnableAcknowLog            = parser.isSet(optionEnableAcknowLog            );
 
-    gBypassFault                = parser.isSet(optionBypassFault                );
     gEnableDryDemo              = parser.isSet(optionEnableDryDemo              );
 
     if (                          parser.isSet(optionActiveCANBus               ) ) {
Index: sources/gui/GuiView.h
===================================================================
diff -u -raf8d98b36b427e2b5f4d6659fcf3b58ee79eab6a -rd3412ddbb51dca3768ce29182d331e5274e9e745
--- sources/gui/GuiView.h	(.../GuiView.h)	(revision af8d98b36b427e2b5f4d6659fcf3b58ee79eab6a)
+++ sources/gui/GuiView.h	(.../GuiView.h)	(revision d3412ddbb51dca3768ce29182d331e5274e9e745)
@@ -79,7 +79,6 @@
     READONLY(GuiUint08IndexMap  , exportListPercent , {})
 
     READONLY(bool   , dryDemoMode   , gEnableDryDemo )
-    READONLY(bool   , bypassFault   , gBypassFault   )
 
 public:
     explicit GuiView(QObject *parent = nullptr);
Index: sources/gui/qml/pages/MainStack.qml
===================================================================
diff -u -raf8d98b36b427e2b5f4d6659fcf3b58ee79eab6a -rd3412ddbb51dca3768ce29182d331e5274e9e745
--- sources/gui/qml/pages/MainStack.qml	(.../MainStack.qml)	(revision af8d98b36b427e2b5f4d6659fcf3b58ee79eab6a)
+++ sources/gui/qml/pages/MainStack.qml	(.../MainStack.qml)	(revision d3412ddbb51dca3768ce29182d331e5274e9e745)
@@ -146,9 +146,7 @@
         function onIsManagerChanged             ( vValue ) { if( vValue ) _mainMenu.isManager  ()                }
         function onIsSettingsChanged            ( vValue ) { if( vValue ) _mainMenu.isSettings ()                }
 
-        function onFaultChanged                 ( vValue ) { page( _GuiView.bypassFault ?           // If the -F (disable-fault-screen) set in CLI,
-                                                                   _mainHome            :           // go to home/standby screen
-                                                                   _faultModeScreen                 , vValue    && ! vSettings.noCANBus  )}
+        function onFaultChanged                 ( vValue ) { page( _mainHome                        , vValue    )}
         function onServiceChanged               ( vValue ) { page( _serviceModeScreen               , 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
Index: sources/main.h
===================================================================
diff -u -raf8d98b36b427e2b5f4d6659fcf3b58ee79eab6a -rd3412ddbb51dca3768ce29182d331e5274e9e745
--- sources/main.h	(.../main.h)	(revision af8d98b36b427e2b5f4d6659fcf3b58ee79eab6a)
+++ sources/main.h	(.../main.h)	(revision d3412ddbb51dca3768ce29182d331e5274e9e745)
@@ -98,7 +98,6 @@
 extern bool       gConsoleoutFrameInterface ;
 extern bool       gConsoleoutCanInterface   ;
 
-extern bool       gBypassFault              ;
 extern bool       gEnableDryDemo            ;
 extern QString    gActiveCANBus             ;