diff --git a/dashboard/src/views/PasswordResetView.vue b/dashboard/src/views/PasswordResetView.vue
index 03a75254e..7ccbe948a 100644
--- a/dashboard/src/views/PasswordResetView.vue
+++ b/dashboard/src/views/PasswordResetView.vue
@@ -31,14 +31,18 @@ async function onPasswordReset() {
   error.value = {};
 
   try {
-    await fetcher.post(`${API_ORIGIN}/api/v1/auth/password_reset_request`, { identifier: passwordResetIdentifier.value });
+    const res = await fetcher.post(`${API_ORIGIN}/api/v1/auth/password_reset_request`, { identifier: passwordResetIdentifier.value });
+    if (res.status === 409) {
+      error.value.generic = res.body.message;
+    } else if (res.status === 202) {
+      mode.value = MODE.NEW_PASSWORD_DONE;
+    }
   } catch (error) {
     error.value.generic = error;
     console.error('Failed to reset password.', error);
   }
 
-  busy.value = 'false';
-  mode.value = MODE.RESET_PASSWORD_DONE;
+  busy.value = false;
 }
 
 async function onNewPassword() {
@@ -107,6 +111,8 @@ onMounted(async () => {
       <div v-if="mode === MODE.RESET_PASSWORD">
         <h2>{{ $t('passwordReset.title') }}</h2>
 
+        <p class="has-error" v-if="error.generic">{{ error.generic }}</p>
+
         <form name="passwordResetForm" @submit.prevent="onPasswordReset()">
           <input type="submit" style="display: none;"/>
 
@@ -123,8 +129,7 @@ onMounted(async () => {
       </div>
 
       <div v-if="mode === MODE.RESET_PASSWORD_DONE">
-        <h4 v-if="error.generic" class="has-error">{{ error.generic }}</h4>
-        <h2 v-else>{{ $t('passwordReset.emailSent.title') }}</h2>
+        <h2>{{ $t('passwordReset.emailSent.title') }}</h2>
         <Button href="/">{{ $t('passwordReset.backToLoginAction') }}</Button>
       </div>
 
diff --git a/src/routes/auth.js b/src/routes/auth.js
index ec2464e41..45aca6f2a 100644
--- a/src/routes/auth.js
+++ b/src/routes/auth.js
@@ -54,7 +54,7 @@ async function logout(req, res) {
 }
 
 async function passwordResetRequest(req, res, next) {
-    if (!req.body.identifier || typeof req.body.identifier !== 'string') return next(new HttpError(401, 'A identifier must be non-empty string'));
+    if (!req.body.identifier || typeof req.body.identifier !== 'string') return next(new HttpError(400, 'A identifier must be non-empty string'));
 
     const [error] = await safe(users.sendPasswordResetByIdentifier(req.body.identifier, AuditSource.fromRequest(req)));
     if (error && !(error.reason === BoxError.NOT_FOUND || error.reason === BoxError.CONFLICT)) return next(BoxError.toHttpError(error));