diff --git a/dashboard/src/components/SetupAccount.vue b/dashboard/src/components/SetupAccount.vue
index 370b792fe..4171c91f7 100644
--- a/dashboard/src/components/SetupAccount.vue
+++ b/dashboard/src/components/SetupAccount.vue
@@ -47,7 +47,7 @@ function validateForm() {
 }
 
 async function onSubmit() {
-  if (!form.value.reportValidity()) return;
+  if (!form.value.reportValidity() || !isFormValid.value) return;
 
   busy.value = true;
   formError.value = {};
diff --git a/dashboard/src/views/PasswordResetView.vue b/dashboard/src/views/PasswordResetView.vue
index 7ccbe948a..48a68d70a 100644
--- a/dashboard/src/views/PasswordResetView.vue
+++ b/dashboard/src/views/PasswordResetView.vue
@@ -35,7 +35,7 @@ async function onPasswordReset() {
     if (res.status === 409) {
       error.value.generic = res.body.message;
     } else if (res.status === 202) {
-      mode.value = MODE.NEW_PASSWORD_DONE;
+      mode.value = MODE.RESET_PASSWORD_DONE;
     }
   } catch (error) {
     error.value.generic = error;
@@ -46,6 +46,8 @@ async function onPasswordReset() {
 }
 
 async function onNewPassword() {
+  if (newPassword.value !== newPasswordRepeat.value) return;
+
   busy.value = true;
   error.value = {};