Index: denali.pro.user
===================================================================
diff -u -r7ebc073150532073ae7f1a0e768272bcff5d6fb3 -r8f336b528afb37743d4ae3404c810e6a9e4422c4
--- denali.pro.user	(.../denali.pro.user)	(revision 7ebc073150532073ae7f1a0e768272bcff5d6fb3)
+++ denali.pro.user	(.../denali.pro.user)	(revision 8f336b528afb37743d4ae3404c810e6a9e4422c4)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.10.0, 2022-08-05T01:13:22. -->
+<!-- Written by QtCreator 4.10.0, 2022-08-11T19:21:52. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>
Index: main.cpp
===================================================================
diff -u -r465a935949a85d3d1bebd11979737ff38ef96122 -r8f336b528afb37743d4ae3404c810e6a9e4422c4
--- main.cpp	(.../main.cpp)	(revision 465a935949a85d3d1bebd11979737ff38ef96122)
+++ main.cpp	(.../main.cpp)	(revision 8f336b528afb37743d4ae3404c810e6a9e4422c4)
@@ -357,6 +357,8 @@
     //! - Initializing required thread types
     Threads::registerTypes();
 
+    bool guiStarted = startGui();
+
     //! - Initializing Logger
     if(_Logger.init(Threads::_Logger_Thread)) {
         _Logger.enableConsoleOut(gConsoleoutLogs);
@@ -412,7 +414,7 @@
     //! - Initialize the QML Viewer and starts GUI
     int app_exec = -1;
     LOG_DEBUG("UI Initializing");
-    if ( startGui() ) {
+    if ( guiStarted /*startGui()*/ ) {
         LOG_DEBUG("UI Initialized");
         _ApplicationController  .startPOST();
         app_exec = app.exec();
Index: sources/gui/qml/main.qml
===================================================================
diff -u -r6f2622be80fcaee8d71baf78404627381157970c -r8f336b528afb37743d4ae3404c810e6a9e4422c4
--- sources/gui/qml/main.qml	(.../main.qml)	(revision 6f2622be80fcaee8d71baf78404627381157970c)
+++ sources/gui/qml/main.qml	(.../main.qml)	(revision 8f336b528afb37743d4ae3404c810e6a9e4422c4)
@@ -223,8 +223,6 @@
 
     Background {}
 
-    GuiView { id: _GuiView }
-
     // ----- Follow the below Z order -----
     // 1 - Screens
     // 1 - 1
@@ -366,4 +364,10 @@
         timeout             : _alarmItem.timeout
         backgroundFading    : vHDOperationMode.fault
     }
+
+    GuiView { id: _GuiView
+//        Component.onCompleted: {
+//            console.debug("GuiView - complete")
+//        }
+    }
 }
Index: sources/gui/qml/pages/settings/SettingsStack.qml
===================================================================
diff -u -ra04fd119778f0483cba5139a11e3c6bad7f2324a -r8f336b528afb37743d4ae3404c810e6a9e4422c4
--- sources/gui/qml/pages/settings/SettingsStack.qml	(.../SettingsStack.qml)	(revision a04fd119778f0483cba5139a11e3c6bad7f2324a)
+++ sources/gui/qml/pages/settings/SettingsStack.qml	(.../SettingsStack.qml)	(revision 8f336b528afb37743d4ae3404c810e6a9e4422c4)
@@ -252,6 +252,9 @@
                 if ( password === vSettings.servicePass ) {
                     _settingsHome.notificationText = ""
                     vAdjustmentServiceMode.doAdjustment()
+                    if ( vSettings.noCANBus ) { // if NoCANBus is set don't wait for HD and go to service mode.
+                        gotoServiceMode(true)
+                    }
                 }
                 else {
                     _settingsHome.notificationText = qsTr("Incorrect service password")
@@ -273,15 +276,19 @@
         }
     }
 
+    function gotoServiceMode( vservice ) {
+//        push( _settingsHome , vservice )
+        serviceMode      = vservice
+        if ( vservice )
+            _mainMenu.hidden = true
+        else
+            if ( _settingsHome.visible )
+                _mainMenu.hidden = false
+    }
+
+
     Connections { target: vHDOperationMode
-        onServiceChanged                : { push( _settingsHome                    , vservice                  )
-            serviceMode      = vservice
-            if ( vservice )
-                _mainMenu.hidden = true
-            else
-                if ( _settingsHome.visible )
-                    _mainMenu.hidden = false
-        }
+        onServiceChanged                : gotoServiceMode(vservice)
     }
 
     onVisibleChanged: {