diff --git a/frontend/src/components/pages/Login.js b/frontend/src/components/pages/Login.js
index cd399ee..69b3021 100644
--- a/frontend/src/components/pages/Login.js
+++ b/frontend/src/components/pages/Login.js
@@ -66,7 +66,7 @@ export default function Login() {
               InputPlaceHolder="Passwort"
             />
             <br />
-            <ErrorMessage message={errorMessage}/>
+            <ErrorMessage message={errorMessage} />
             <SubmitField onClick={onSubmitClick} LabelName="Einloggen" />
           </form>
         ) : (
diff --git a/frontend/src/components/pages/Register.js b/frontend/src/components/pages/Register.js
index 5d6f241..11308f4 100644
--- a/frontend/src/components/pages/Register.js
+++ b/frontend/src/components/pages/Register.js
@@ -6,6 +6,8 @@ import InputField from "../InputField";
 import SubmitField from "../SubmitField";
 import "../Input.css";
 import ErrorMessage from "../ErrorMessage";
+import { login, useAuth } from "../../auth/AuthProvider";
+import { Redirect } from "react-router-dom";
 
 export default function Login() {
   const [username, setUsername] = useState("");
@@ -16,6 +18,8 @@ export default function Login() {
 
   const [isStatusOk, setIsStatusOk] = useState("");
 
+  const [isLoggedIn] = useAuth();
+
   const onSubmitClick = (e) => {
     e.preventDefault();
     let opts = {
@@ -37,6 +41,14 @@ export default function Login() {
       } else if (response.status === 200) {
         response.json().then((resp) => {
           setMessage(resp.message);
+          fetch("/api/login", {
+            method: "post",
+            body: JSON.stringify(opts),
+          }).then((response) => {
+            response.json().then((token) => {
+              login(token);
+            });
+          });
         });
         setIsStatusOk(true);
       }
@@ -73,7 +85,7 @@ export default function Login() {
           <SubmitField onClick={onSubmitClick} LabelName="Registrieren" />
         </form>
 
-        {isStatusOk && <p>{message}</p>}
+        {isLoggedIn && <Redirect to="/umfrage" />}
       </div>
       <Footer />
     </>