diff --git a/frontend/src/views/Pages/ForgotPassword.vue b/frontend/src/views/Pages/ForgotPassword.vue
index 654711dc7..c53015af7 100644
--- a/frontend/src/views/Pages/ForgotPassword.vue
+++ b/frontend/src/views/Pages/ForgotPassword.vue
@@ -19,7 +19,7 @@
             <b-card-body class="p-4">
               <validation-observer ref="observer" v-slot="{ handleSubmit }">
                 <b-form role="form" @submit.prevent="handleSubmit(onSubmit)">
-                  <input-email v-model="form.email"></input-email>
+                  <input-email v-model="form.email" :defaultValue="defaultEmail"></input-email>
                   <div class="text-center">
                     <b-button type="submit" variant="primary">
                       {{ $t(displaySetup.button) }}
@@ -68,6 +68,7 @@ export default {
         email: '',
       },
       displaySetup: {},
+      defaultEmail: this.$store.state.email,
     }
   },
   methods: {
diff --git a/frontend/src/views/Pages/Login.vue b/frontend/src/views/Pages/Login.vue
index 4d2b75d2a..5a05fa8a5 100755
--- a/frontend/src/views/Pages/Login.vue
+++ b/frontend/src/views/Pages/Login.vue
@@ -107,8 +107,10 @@ export default {
         .catch((error) => {
           this.$toasted.global.error(this.$t('error.no-account'))
           if (error.message.includes('User email not validated')) {
+            this.$store.commit('email', this.form.email)
             this.$router.push('/thx/login')
           } else if (error.message.includes('User has no password set yet')) {
+            this.$store.commit('email', this.form.email)
             this.$router.push('/reset/login')
           }
           loader.hide()