diff --git a/frontend/src/components/Inputs/InputEmail.vue b/frontend/src/components/Inputs/InputEmail.vue
index 8c7087bf3..2aa153486 100644
--- a/frontend/src/components/Inputs/InputEmail.vue
+++ b/frontend/src/components/Inputs/InputEmail.vue
@@ -4,7 +4,6 @@
     :rules="rules"
     :name="name"
     v-slot="{ errors, valid, validated, ariaInput, ariaMsg }"
-    immediate
   >
     <b-form-group :label="label" :label-for="labelFor">
       <b-form-input
@@ -39,11 +38,10 @@ export default {
     label: { type: String, default: 'Email' },
     placeholder: { type: String, default: 'Email' },
     value: { required: true, type: String },
-    defaultValue: { type: String },
   },
   data() {
     return {
-      currentValue: this.defaultValue !== undefined ? this.defaultValue : '',
+      currentValue: '',
     }
   },
   computed: {
@@ -59,10 +57,5 @@ export default {
       if (this.value !== this.currentValue) this.currentValue = this.value
     },
   },
-  mounted() {
-    if (this.defaultValue !== undefined) {
-      this.$emit('input', this.currentValue)
-    }
-  },
 }
 </script>
diff --git a/frontend/src/pages/ForgotPassword.spec.js b/frontend/src/pages/ForgotPassword.spec.js
index 1815e2506..a547f9cc1 100644
--- a/frontend/src/pages/ForgotPassword.spec.js
+++ b/frontend/src/pages/ForgotPassword.spec.js
@@ -28,11 +28,6 @@ const createMockObject = (comingFrom) => {
           comingFrom,
         },
       },
-      $store: {
-        state: {
-          email: undefined,
-        },
-      },
     },
     stubs,
   }
diff --git a/frontend/src/pages/ForgotPassword.vue b/frontend/src/pages/ForgotPassword.vue
index 18ef22e69..eeb954a0c 100644
--- a/frontend/src/pages/ForgotPassword.vue
+++ b/frontend/src/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" :defaultValue="defaultEmail"></input-email>
+                  <input-email v-model="form.email"></input-email>
                   <div class="text-center">
                     <b-button type="submit" variant="primary">
                       {{ $t(displaySetup.button) }}
@@ -68,7 +68,6 @@ export default {
         email: '',
       },
       displaySetup: {},
-      defaultEmail: this.$store.state.email,
     }
   },
   methods: {
diff --git a/frontend/src/pages/Login.vue b/frontend/src/pages/Login.vue
index 8546bf30b..57b97200d 100755
--- a/frontend/src/pages/Login.vue
+++ b/frontend/src/pages/Login.vue
@@ -107,10 +107,8 @@ export default {
         .catch((error) => {
           this.toastError(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-password/login')
           }
           loader.hide()