Index: sources/gui/qml/pages/settings/SettingsServicePassword.qml
===================================================================
diff -u -r6c363d016811a09e31d03c94e2e459ea5aa4bd9f -r124c2e38e72a1a655d9d479c9c7a1cd8c5d5e6c4
--- sources/gui/qml/pages/settings/SettingsServicePassword.qml	(.../SettingsServicePassword.qml)	(revision 6c363d016811a09e31d03c94e2e459ea5aa4bd9f)
+++ sources/gui/qml/pages/settings/SettingsServicePassword.qml	(.../SettingsServicePassword.qml)	(revision 124c2e38e72a1a655d9d479c9c7a1cd8c5d5e6c4)
@@ -1,15 +1,15 @@
 /*!
  *
- * Copyright (c) 2021-2023 Diality Inc. - All Rights Reserved.
+ * Copyright (c) 2023-2025 Diality Inc. - All Rights Reserved.
  * \copyright
  * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
  * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
  *
  * \file    SettingsServicePassword.qml
  * \author  (last)      Behrouz NematiPour
- * \date    (last)      11-May-2023
+ * \date    (last)      28-Aug-2023
  * \author  (original)  Behrouz NematiPour
- * \date    (original)  11-May-2023
+ * \date    (original)  18-Jul-2023
  *
  */
 
@@ -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() {