Index: sources/gui/qml/pages/settings/SettingsServicePassword.qml
===================================================================
diff -u -r9c7a790376d07de7ddaa67e39d47102d68693c87 -r789c41cc050e48a9821c3e771791c8907907b63c
--- sources/gui/qml/pages/settings/SettingsServicePassword.qml	(.../SettingsServicePassword.qml)	(revision 9c7a790376d07de7ddaa67e39d47102d68693c87)
+++ sources/gui/qml/pages/settings/SettingsServicePassword.qml	(.../SettingsServicePassword.qml)	(revision 789c41cc050e48a9821c3e771791c8907907b63c)
@@ -58,11 +58,11 @@
 
             _root.isPassword_Accepted = true
             _root.notificationText = ""
-            vAdjustmentServiceMode.doAdjustment()
             if ( vSettings.noCANBus ) { // if NoCANBus is set don't wait for HD and go to service mode.
                 gotoServiceMode(true)
             }
         }
+        vAdjustmentServiceMode.doAdjustment()
         clearPassword()
         page(_settingsHome)
     }