Index: sources/gui/qml/pages/settings/SettingsServicePassword.qml
===================================================================
diff -u -rdc7757a4c3c6e2c9dab1e84a5a1fb04d95d74c9f -rc73feffa73c7fe073a7a7581144f5806dfc91beb
--- sources/gui/qml/pages/settings/SettingsServicePassword.qml	(.../SettingsServicePassword.qml)	(revision dc7757a4c3c6e2c9dab1e84a5a1fb04d95d74c9f)
+++ sources/gui/qml/pages/settings/SettingsServicePassword.qml	(.../SettingsServicePassword.qml)	(revision c73feffa73c7fe073a7a7581144f5806dfc91beb)
@@ -27,13 +27,13 @@
 UserConfirmation{ id: _root
     itemIndex       : SettingsStack.ServicePassword
 
-    property bool isPassword_Accepted   : false
-    property bool isDefaultPasswordSet  : vSettings.isPasswordSet
+             property bool isPassword_Accepted       : false
+    readonly property bool isDefaultServicePassword  : vSettings.isDefaultServicePassword
 
-    backVisible         : ! _GuiView.manufactSetup
-    title               :   isDefaultPasswordSet ? qsTr("Service Password") : qsTr("Set Service Password")
     isPassword          :   true
-    passwordChangeMode  : ! isDefaultPasswordSet && _GuiView.manufactSetup
+    backVisible         : ! _GuiView.manufactSetup
+    passwordChangeMode  :   isDefaultServicePassword && _GuiView.manufactSetup
+    title               :   passwordChangeMode ? qsTr("Set Service Password") : qsTr("Service Password")
 
     onBackClicked       : {
         clearPasswords()
@@ -48,7 +48,7 @@
         if ( ! isPassword_Accepted ) return
 
         // of accepted save the password
-        if (   passwordChangeMode ) vSettings.updatePassword(passwordUpdated)
+        if (   passwordChangeMode ) vSettings.updateServicePassword(passwordUpdated)
 
         // ask HD to go to service mode
         vAdjustmentServiceMode.doAdjustment()
@@ -65,13 +65,13 @@
     }
 
     function checkPassword() {
-        if ( ! vSettings.isPasswordMatch(passwordCurrent ) ) { _root.notificationText = qsTr("Incorrect password"   ); return false }
+        if ( ! vSettings.isServicePasswordMatch( passwordCurrent ) ) { _root.notificationText = qsTr("Incorrect password"   ); return false }
 
-        if ( ! passwordChangeMode                          ) { _root.notificationText = ""                           ; return true  }
+        if ( ! passwordChangeMode                                  ) { _root.notificationText = ""                           ; return true  }
 
-        if (    passwordConfirm !=       passwordUpdated   ) { _root.notificationText = qsTr("Mismatch Passwords"   ); return false }
-        if ( ! vSettings.isPasswordValid(passwordUpdated ) ) { _root.notificationText = qsTr("Invalid Password"     ); return false }
+        if (    passwordConfirm !=       passwordUpdated           ) { _root.notificationText = qsTr("Mismatch Passwords"   ); return false }
+        if ( ! vSettings.isPasswordValid(passwordUpdated         ) ) { _root.notificationText = qsTr("Invalid Password"     ); return false }
 
-                                                               _root.notificationText = ""                           ; return true
+                                                                       _root.notificationText = ""                           ; return true
     }
 }