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: {