diff --git a/frontend/src/components/Auth/Header.vue b/frontend/src/components/Auth/Header.vue
index 7dd61a197..001ddfa6d 100644
--- a/frontend/src/components/Auth/Header.vue
+++ b/frontend/src/components/Auth/Header.vue
@@ -20,9 +20,11 @@
 
           <b-nav-item href="#">Kontakt</b-nav-item>
 
-          <b-nav-item href="#">Anmelden</b-nav-item>
+          <b-nav-item href="#!" @click="$emit('setAuthItem', 'AUTH_LOGIN')">Anmelden</b-nav-item>
 
-          <b-nav-item href="#">Registrieren</b-nav-item>
+          <b-nav-item href="#!" @click="$emit('setAuthItem', 'AUTH_REGISTER')">
+            Registrieren
+          </b-nav-item>
         </b-navbar-nav>
       </b-collapse>
     </b-navbar>
diff --git a/frontend/src/components/Auth/Login.vue b/frontend/src/components/Auth/Login.vue
index d2cad2993..8410cbe48 100644
--- a/frontend/src/components/Auth/Login.vue
+++ b/frontend/src/components/Auth/Login.vue
@@ -29,14 +29,14 @@
 
     <b-row class="mt-3">
       <b-col cols="6" class="text-center text-sm-left col-12 col-sm-6 pb-5">
-        <router-link to="/forgot-password" class="mt-3">
+        <b-link href="#!" class="mt-3" @click="$emit('setAuthItem', 'AUTH_FORGOT_PASSWORD')">
           {{ $t('settings.password.forgot_pwd') }}
-        </router-link>
+        </b-link>
       </b-col>
       <b-col cols="6" class="text-center text-sm-right col-12 col-sm-6">
-        <router-link to="/register" class="mt-3">
+        <b-link href="#!" class="mt-3" @click="$emit('setAuthItem', 'AUTH_REGISTER')">
           {{ $t('site.login.new_wallet') }}
-        </router-link>
+        </b-link>
       </b-col>
     </b-row>
   </div>
diff --git a/frontend/src/components/Auth/Register.vue b/frontend/src/components/Auth/Register.vue
index a9da00db1..302b416ca 100644
--- a/frontend/src/components/Auth/Register.vue
+++ b/frontend/src/components/Auth/Register.vue
@@ -123,11 +123,6 @@
 
             <div class="text-center mt-5">
               <div class="text-center">
-                <router-link class="test-button-back" to="/login">
-                  <b-button variant="outline-gradido" class="mr-4">
-                    {{ $t('back') }}
-                  </b-button>
-                </router-link>
                 <b-button
                   :disabled="disabled"
                   type="submit"