diff --git a/frontend/src/pages/settings/account.vue b/frontend/src/pages/settings/account.vue
index ce6f54be8..127cb0bf3 100644
--- a/frontend/src/pages/settings/account.vue
+++ b/frontend/src/pages/settings/account.vue
@@ -43,9 +43,11 @@
                       v-model="confirmPassword"
               ></v-text-field>
             </v-flex>
-            <v-flex xs12 text-xs-left class="px-2 pt-4 pb-2">
-              <v-btn depressed dark color="secondary-dark" @click.stop="confirm"
-                     class="action-confirm ma-0" :disabled="busy">
+            <v-flex xs12 class="px-2 pt-4 pb-2">
+              <v-btn depressed color="secondary-dark"
+                     @click.stop="confirm"
+                     :disabled="disabled()"
+                     class="action-confirm white--text ma-0">
                 <translate>Change Password</translate>
                 <v-icon right dark>vpn_key</v-icon>
               </v-btn>
@@ -71,7 +73,7 @@
         },
         methods: {
             disabled() {
-                return (this.oldPassword === "" || this.newPassword === "" || (this.newPassword !== this.confirmPassword));
+                return (this.busy || this.oldPassword === "" || this.newPassword === "" || (this.newPassword !== this.confirmPassword));
             },
             confirm() {
                 this.busy = true;
diff --git a/internal/entity/password.go b/internal/entity/password.go
index 080dd0b25..766319831 100644
--- a/internal/entity/password.go
+++ b/internal/entity/password.go
@@ -3,7 +3,6 @@ package entity
 import (
 	"time"
 
-	"github.com/photoprism/photoprism/pkg/txt"
 	"golang.org/x/crypto/bcrypt"
 )
 
@@ -68,8 +67,6 @@ func FindPassword(uid string) *Password {
 
 	if err := Db().Where("uid = ?", uid).First(&result).Error; err == nil {
 		return &result
-	} else {
-		log.Errorf("auth: no password for %s", txt.Quote(uid))
 	}
 
 	return nil