diff --git a/frontend/src/pages/ForgotPassword.vue b/frontend/src/pages/ForgotPassword.vue
index 77c2ac926..70d578e10 100644
--- a/frontend/src/pages/ForgotPassword.vue
+++ b/frontend/src/pages/ForgotPassword.vue
@@ -24,10 +24,20 @@
     </b-container>
     <b-container v-else>
       <message
-        :headline="success ? $t('message.title') : $t('message.errorTitle')"
-        :subtitle="success ? $t('message.email') : $t('error.email-already-sent')"
+        v-if="success"
+        :headline="$t('message.title')"
+        :subtitle="$t('message.email')"
         :buttonText="$t('login')"
         linkTo="/login"
+        data-test="forgot-password-success"
+      />
+      <message
+        v-else
+        :headline="$t('message.errorTitle')"
+        :subtitle="$t('error.email-already-sent')"
+        :buttonText="$t('login')"
+        linkTo="/login"
+        data-test="forgot-password-error"
       />
     </b-container>
   </div>
diff --git a/frontend/src/pages/Login.vue b/frontend/src/pages/Login.vue
index f3f27f83e..6abb6d6b6 100755
--- a/frontend/src/pages/Login.vue
+++ b/frontend/src/pages/Login.vue
@@ -24,7 +24,7 @@
           </b-row>
           <b-row>
             <b-col class="d-flex justify-content-end">
-              <router-link to="/forgot-password" class="mt-3" data-test=forgot-password-link>
+              <router-link to="/forgot-password" class="mt-3" data-test="forgot-password-link">
                 {{ $t('settings.password.forgot_pwd') }}
               </router-link>
             </b-col>
diff --git a/frontend/src/pages/ResetPassword.vue b/frontend/src/pages/ResetPassword.vue
index ec7ae6811..0d79fcf0d 100644
--- a/frontend/src/pages/ResetPassword.vue
+++ b/frontend/src/pages/ResetPassword.vue
@@ -5,7 +5,7 @@
       <b-form role="form" @submit.prevent="handleSubmit(onSubmit)">
         <input-password-confirmation v-model="form" />
         <div class="text-center">
-          <b-button type="submit" variant="gradido" class="mt-4">
+          <b-button type="submit" variant="gradido" class="mt-4" data-test="submit-new-password-btn">
             <!-- eslint-disable-next-line @intlify/vue-i18n/no-dynamic-keys-->
             {{ $t(displaySetup.button) }}
           </b-button>