diff --git a/frontend/app/pages/forgot-password.vue b/frontend/app/pages/forgot-password.vue
index 8570cc5ad..832d970c8 100644
--- a/frontend/app/pages/forgot-password.vue
+++ b/frontend/app/pages/forgot-password.vue
@@ -14,7 +14,7 @@
       </v-card-title>
       <BaseDivider />
       <v-card-text>
-        <v-form @submit.prevent="requestLink()">
+        <v-form ref="form" @submit.prevent="requestLink()">
           <v-text-field
             v-model="state.email"
             :prepend-inner-icon="$globals.icons.email"
@@ -24,6 +24,7 @@
             name="login"
             :label="$t('user.email')"
             type="text"
+            :rules="[validators.email]"
           />
           <p class="text-center">
             {{ $t('user.forgot-password-text') }}
@@ -63,11 +64,15 @@
 <script setup lang="ts">
 import { useUserApi } from "~/composables/api";
 import { alert } from "~/composables/use-toast";
+import { validators } from "~/composables/use-validators";
+import type { VForm } from "~/types/auto-forms";
 
 definePageMeta({
   layout: "basic",
 });
 
+const form = ref<VForm | null>(null);
+
 const state = reactive({
   email: "",
   loading: false,
@@ -84,17 +89,27 @@ useSeoMeta({
 const api = useUserApi();
 
 async function requestLink() {
+  if (!form.value) {
+    return;
+  };
+
+  const { valid } = await form.value.validate();
+  if (!valid) {
+    return;
+  };
+
   state.loading = true;
   // TODO: Fix Response to send meaningful error
   const { response } = await api.email.sendForgotPassword({ email: state.email });
 
+  state.loading = false;
+
   if (response?.status === 200) {
-    state.loading = false;
     state.error = false;
     alert.success(i18n.t("profile.email-sent"));
+    await navigateTo("/login");
   }
   else {
-    state.loading = false;
     state.error = true;
     alert.error(i18n.t("profile.error-sending-email"));
   }
diff --git a/frontend/app/pages/reset-password.vue b/frontend/app/pages/reset-password.vue
index 49bfcbe94..7df9fe32d 100644
--- a/frontend/app/pages/reset-password.vue
+++ b/frontend/app/pages/reset-password.vue
@@ -14,7 +14,7 @@
       </v-card-title>
       <BaseDivider />
       <v-card-text>
-        <v-form @submit.prevent="requestLink()">
+        <v-form ref="form" @submit.prevent="requestLink()">
           <v-text-field
             v-model="state.email"
             :prepend-inner-icon="$globals.icons.email"
@@ -86,6 +86,7 @@ import { useUserApi } from "~/composables/api";
 import { alert } from "~/composables/use-toast";
 import { validators } from "@/composables/use-validators";
 import { useRouteQuery } from "~/composables/use-router";
+import type { VForm } from "~/types/auto-forms";
 
 definePageMeta({
   layout: "basic",
@@ -99,6 +100,8 @@ const state = reactive({
   error: false,
 });
 
+const form = ref<VForm | null>(null);
+
 const i18n = useI18n();
 const passwordMatch = () => state.password === state.passwordConfirm || i18n.t("user.password-must-match");
 
@@ -115,6 +118,15 @@ const token = useRouteQuery("token", "");
 // API
 const api = useUserApi();
 async function requestLink() {
+  if (!form.value) {
+    return;
+  };
+
+  const { valid } = await form.value.validate();
+  if (!valid) {
+    return;
+  };
+
   state.loading = true;
   // TODO: Fix Response to send meaningful error
   const { response } = await api.users.resetPassword({
@@ -127,12 +139,11 @@ async function requestLink() {
   state.loading = false;
 
   if (response?.status === 200) {
-    state.loading = false;
     state.error = false;
     alert.success(i18n.t("user.password-updated"));
+    await navigateTo("/login");
   }
   else {
-    state.loading = false;
     state.error = true;
     alert.error(i18n.t("events.something-went-wrong"));
   }