Index: sources/gui/qml/pages/settings/SettingsServicePassword.qml
===================================================================
diff -u -rbba70435ebe0bbbc9bf5b4282f7d0906a8b49b1a -rdc7757a4c3c6e2c9dab1e84a5a1fb04d95d74c9f
--- sources/gui/qml/pages/settings/SettingsServicePassword.qml	(.../SettingsServicePassword.qml)	(revision bba70435ebe0bbbc9bf5b4282f7d0906a8b49b1a)
+++ sources/gui/qml/pages/settings/SettingsServicePassword.qml	(.../SettingsServicePassword.qml)	(revision dc7757a4c3c6e2c9dab1e84a5a1fb04d95d74c9f)
@@ -33,7 +33,7 @@
     backVisible         : ! _GuiView.manufactSetup
     title               :   isDefaultPasswordSet ? qsTr("Service Password") : qsTr("Set Service Password")
     isPassword          :   true
-    passwordChangeMode  : ! isDefaultPasswordSet
+    passwordChangeMode  : ! isDefaultPasswordSet && _GuiView.manufactSetup
 
     onBackClicked       : {
         clearPasswords()