Index: sources/gui/qml/pages/settings/SettingsServicePassword.qml
===================================================================
diff -u -r6bff7fae4c7b28a493b5824598c669fa8ab920b3 -r6dc7e02773a4823c69b685d8466ea7d58dd320d1
--- sources/gui/qml/pages/settings/SettingsServicePassword.qml	(.../SettingsServicePassword.qml)	(revision 6bff7fae4c7b28a493b5824598c669fa8ab920b3)
+++ sources/gui/qml/pages/settings/SettingsServicePassword.qml	(.../SettingsServicePassword.qml)	(revision 6dc7e02773a4823c69b685d8466ea7d58dd320d1)
@@ -63,8 +63,14 @@
         let servicePasswordCheck    = false
         let user1PasswordCheck      = false // does nothing right now
 
-        if ( vSettings.isServicePasswordMatch( passwordCurrent ) || passwordChangeMode  ){ handleServicePassword(); servicePasswordCheck = true }
+        if ( vSettings.isServicePasswordMatch( passwordCurrent ) ) {
+            if (passwordChangeMode) {
+                handleServicePassword()
+            }
 
+            servicePasswordCheck = true
+        }
+
         // TODO: Add other password match checks for other users
 //        if ( vSettings.isUser1PasswordMatch( passwordCurrent ) || passwordChangeMode    ){ handleUser1Password();   user1PasswordCheck = true   }