diff --git a/pages/settings/account.vue b/pages/settings/account.vue
index 0a557d69d..43589984a 100644
--- a/pages/settings/account.vue
+++ b/pages/settings/account.vue
@@ -119,8 +119,8 @@
               type="button"
               class="iconified-button brand-button"
               :disabled="
-                newPassword.length === 0 ||
-                oldPassword.length === 0 ||
+                newPassword.length == 0 ||
+                (auth.user.has_password && oldPassword.length == 0) ||
                 newPassword !== confirmNewPassword
               "
               @click="savePassword"