diff --git a/Controller/AuthController.php b/Controller/AuthController.php
index 614c4ef..78e8511 100644
--- a/Controller/AuthController.php
+++ b/Controller/AuthController.php
@@ -30,6 +30,21 @@ class AuthController
         unset($_SESSION['auth_errors'], $_SESSION['auth_validData']);
     }
 
+    public function showRegistrationForm()
+    {
+        $this->view->setVars([
+            'labels' => [
+                "email" => "E-Mail-Adresse",
+                "password" => "Passwort",
+                "password_repeat" => "Passwort wiederholen",
+                "old_password" => "Altes Passwort"
+            ],
+            'errors' => $_SESSION['auth_errors'] ?? [],
+            'validData' => $_SESSION['auth_validData'] ?? []
+        ]);
+        unset($_SESSION['auth_errors'], $_SESSION['auth_validData']);
+    }
+
     public function login() {
         $email = $_POST['email'];
         $password = $_POST['password'];
diff --git a/Views/Auth/login.phtml b/Views/Auth/login.phtml
index 14e1532..374f0f2 100644
--- a/Views/Auth/login.phtml
+++ b/Views/Auth/login.phtml
@@ -28,6 +28,9 @@ include dirname(__DIR__).'/header.phtml';
                 </div>
                 <button class="login-btn" type="submit">Einloggen</button>
             </form>
+            <div style="text-align:center; margin-top: 1.5em;">
+                <a href="?controller=Auth&do=register" class="login-link">Konto erstellen</a>
+            </div>
         <?php endif; ?>
     </div>
 </div>
diff --git a/Views/Auth/register.phtml b/Views/Auth/register.phtml
index 4d2f91c..9161031 100644
--- a/Views/Auth/register.phtml
+++ b/Views/Auth/register.phtml
@@ -58,4 +58,8 @@
         <button type="submit">Registrieren</button>
     </form>
 
+<div style="text-align:center; margin-top: 1.5em;">
+    <a href="?controller=Auth&do=showAuthForm" class="login-link">Bereits registriert? Hier einloggen</a>
+</div>
+
 <?php include dirname(__DIR__).'/footer.phtml'; ?>
\ No newline at end of file
diff --git a/Views/Auth/showAuthForm.phtml b/Views/Auth/showAuthForm.phtml
index 3418048..2d76e8e 100644
--- a/Views/Auth/showAuthForm.phtml
+++ b/Views/Auth/showAuthForm.phtml
@@ -17,7 +17,7 @@ include dirname(__DIR__) . '/header.phtml';
         </form>
         <button class="button-loggin">Login</button>
         <a class="link-passwort-vergessen">Passwort vergessen?</a>
-        <a class="link-konto-erstellen">Konto erstellen</a>
+        <a class="link-konto-erstellen" href="?controller=Auth&do=showRegistrationForm">Konto erstellen</a>
     </div>
 </div>
 
diff --git a/Views/Register/showRegisterPage.phtml b/Views/Auth/showRegistrationForm.phtml
similarity index 93%
rename from Views/Register/showRegisterPage.phtml
rename to Views/Auth/showRegistrationForm.phtml
index 278849f..342e1c2 100644
--- a/Views/Register/showRegisterPage.phtml
+++ b/Views/Auth/showRegistrationForm.phtml
@@ -60,7 +60,8 @@ include dirname(__DIR__) . '/header.phtml';
             </label>
         </form>
         <button class="button-register">Registrieren</button>
-        <a class="link-konto-erstellen">Login</a>
+        <div style="text-align:center; margin-top: 1.5em;">
+        <a href="?controller=Auth&do=showAuthForm" class="login-link">Bereits registriert? Hier einloggen</a>
     </div>
 </div>
 <?php