Index: sources/gui/qml/pages/settings/SettingsServicePassword.qml
===================================================================
diff -u -r789c41cc050e48a9821c3e771791c8907907b63c -r7ec98d237f871e5d1206809d309da6d57a086d28
--- sources/gui/qml/pages/settings/SettingsServicePassword.qml	(.../SettingsServicePassword.qml)	(revision 789c41cc050e48a9821c3e771791c8907907b63c)
+++ sources/gui/qml/pages/settings/SettingsServicePassword.qml	(.../SettingsServicePassword.qml)	(revision 7ec98d237f871e5d1206809d309da6d57a086d28)
@@ -28,8 +28,10 @@
     itemIndex       : SettingsStack.ServicePassword
 
     property bool isPassword_Accepted   : false
-    property bool isDefaultPasswordSet  : (vSettings.servicePass != "")
+    property bool isDefaultPasswordSet  : vSettings.isPasswordSet
 
+    onIsDefaultPasswordSetChanged: console.log(isDefaultPasswordSet)
+
     backVisible     : ! _GuiView.manufactSetup
     title           : isDefaultPasswordSet ? qsTr("Service Password") : qsTr("Set Service Password")
     isPassword      : true