diff --git a/webapp/components/PasswordReset/VerifyCode.spec.js b/webapp/components/PasswordReset/VerifyCode.spec.js
index 63e8ce2b3..0d198721b 100644
--- a/webapp/components/PasswordReset/VerifyCode.spec.js
+++ b/webapp/components/PasswordReset/VerifyCode.spec.js
@@ -41,7 +41,8 @@ describe('VerifyCode ', () => {
     describe('after verification code given', () => {
       beforeEach(() => {
         wrapper = Wrapper()
-        wrapper.find('input').setValue('123456')
+        wrapper.find('input#email').setValue('mail@example.org')
+        wrapper.find('input#code').setValue('123456')
         wrapper.find('form').trigger('submit')
       })
 
diff --git a/webapp/components/PasswordReset/VerifyCode.vue b/webapp/components/PasswordReset/VerifyCode.vue
index 6e8f116ed..67a164ba6 100644
--- a/webapp/components/PasswordReset/VerifyCode.vue
+++ b/webapp/components/PasswordReset/VerifyCode.vue
@@ -2,7 +2,7 @@
   <ds-card class="verify-code">
     <ds-space margin="large">
       <ds-form
-        v-if="!codeSubmitted"
+        v-if="!verificationSubmitted"
         v-model="verification.formData"
         :schema="verification.formSchema"
         @submit="handleSubmitVerify"
@@ -10,9 +10,17 @@
         @input-valid="handleInputValid"
       >
         <ds-input
-          :placeholder="$t('verify-code.form.input')"
+          :placeholder="$t('login.email')"
+          model="email"
+          id="email"
+          name="email"
+          icon="envelope"
+        />
+        <ds-input
+          :placeholder="$t('verify-code.form.code')"
           model="code"
           name="code"
+          id="code"
           icon="question-circle"
         />
         <ds-space margin-botton="large">
@@ -68,9 +76,15 @@ export default {
     return {
       verification: {
         formData: {
+          email: '',
           code: '',
         },
         formSchema: {
+          email: {
+            type: 'email',
+            required: true,
+            message: this.$t('common.validations.email'),
+          },
           code: {
             type: 'string',
             min: 6,
@@ -103,7 +117,7 @@ export default {
           ],
         },
       },
-      codeSubmitted: false,
+      verificationSubmitted: false,
       disabled: true,
     }
   },
@@ -115,7 +129,7 @@ export default {
       this.disabled = false
     },
     handleSubmitVerify() {
-      this.codeSubmitted = true
+      this.verificationSubmitted = true
     },
     handleSubmitPassword() {},
     matchPassword(rule, value, callback, source, options) {
diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index cd04befe0..502f72607 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -24,7 +24,7 @@
   },
   "verify-code": {
     "form": {
-      "input": "Code eingeben",
+      "code": "Code eingeben",
       "description": "Öffne Deine E-Mail Postfach und gib den Code ein, den wir geschickt haben.",
       "submit": "Sicherheitscode überprüfen",
       "change-password":{
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index b0dcc0f03..2aac32ca6 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -24,7 +24,7 @@
   },
   "verify-code": {
     "form": {
-      "input": "Enter your code",
+      "code": "Enter your code",
       "description": "Open your inbox and enter the code that we've sent to you.",
       "submit": "Check security code",
       "change-password": {