diff --git a/auth.py b/auth.py
index 95be6dc..c0263cf 100644
--- a/auth.py
+++ b/auth.py
@@ -127,7 +127,7 @@ def login():
             (uidquery, int(time.time()), timeout, "", session)
         )
 
-    response = redirect("/")
+    response = make_response("<script>location.href = '/';</script>")
     response.set_cookie('session', value=session, expires=timeout)
     return response 
 
diff --git a/templates/auth/login.html b/templates/auth/login.html
index 23fa338..5ee45d3 100644
--- a/templates/auth/login.html
+++ b/templates/auth/login.html
@@ -1,5 +1,5 @@
 <h2>Einloggen</h2>
-<form action="/auth/login" method="post" >
+<form hx-post="/auth/login" hx-target="#main-frame"  >
     <input type="text" name="user" placeholder="Nutzername" value="{{ username }}"><br>
     <input type="password" name="pass" placeholder="Passphrase"><br>
     <label>Automatisch abmelden in:</label>
diff --git a/templates/auth/registersuccess.html b/templates/auth/registersuccess.html
index 82b8752..b5a0c9c 100644
--- a/templates/auth/registersuccess.html
+++ b/templates/auth/registersuccess.html
@@ -1 +1,4 @@
 <h2>Willkommen im Kontrollverlust!</h2>
+<p>Du kannst dich nun als {{username}} <button hx-get="/auth/login" hx-target="#main-frame">Anmelden</button>
+!</p>
+