Index: sources/gui/qml/pages/settings/SettingsServicePassword.qml
===================================================================
diff -u -r80b5e8f1ebb90c03c37d90d90cd2da3bd95d6803 -rb9eb580cf3997837af24757ceaf845af62501a1e
--- sources/gui/qml/pages/settings/SettingsServicePassword.qml	(.../SettingsServicePassword.qml)	(revision 80b5e8f1ebb90c03c37d90d90cd2da3bd95d6803)
+++ sources/gui/qml/pages/settings/SettingsServicePassword.qml	(.../SettingsServicePassword.qml)	(revision b9eb580cf3997837af24757ceaf845af62501a1e)
@@ -60,8 +60,11 @@
         // go back to the settings home/menu screen
         page(_settingsHome)
 
+        // in case of debugging that the HD is in service mode already check and call the gotoServiceMode
+        if ( vHDOperationMode.service   ) gotoServiceMode(true)
+
         // if NoCANBus is set don't wait for HD and go to service mode.
-        if ( vSettings.noCANBus )  gotoServiceMode(true)
+        if ( vSettings.noCANBus         ) gotoServiceMode(true)
     }
 
     function checkPassword() {
Index: sources/gui/qml/pages/settings/SettingsStack.qml
===================================================================
diff -u -r689177edf29dee6f10bebfed42f6bbadeb7ce8a8 -rb9eb580cf3997837af24757ceaf845af62501a1e
--- sources/gui/qml/pages/settings/SettingsStack.qml	(.../SettingsStack.qml)	(revision 689177edf29dee6f10bebfed42f6bbadeb7ce8a8)
+++ sources/gui/qml/pages/settings/SettingsStack.qml	(.../SettingsStack.qml)	(revision b9eb580cf3997837af24757ceaf845af62501a1e)
@@ -174,6 +174,7 @@
         itemsEnabled    : _root.itemsEnabled
         itemsVisible    : _root.itemsVisible
         onItemClicked   : {
+            vDevice.status = ""
             switch (vIndex) {
             case SettingsStack.Information:
                 push(_settingsInformation)