diff --git a/frontend/src/pages/Login.tsx b/frontend/src/pages/Login.tsx
index d07c392e..ce8934bf 100644
--- a/frontend/src/pages/Login.tsx
+++ b/frontend/src/pages/Login.tsx
@@ -14,6 +14,7 @@ const Login = () => {
   const [password, setPassword] = useState('');
   const [saveLogin, setSaveLogin] = useState(false);
   const [waitingForBackend, setWaitingForBackend] = useState(false);
+  const [loggingIn, setLoggingIn] = useState(false);
   const [waitedCount, setWaitedCount] = useState(0);
   const [errorMessage, setErrorMessage] = useState<string | null>(null);
 
@@ -25,17 +26,15 @@ const Login = () => {
     }
 
     setErrorMessage(null);
-
+    setLoggingIn(true);
     const loginResponse = await signIn(username, password, saveLogin);
-
     const signedIn = loginResponse.status === 204;
-
     if (signedIn) {
       navigate(Routes.Home);
     } else {
       const data = await loginResponse.json();
       setErrorMessage(data?.error || 'Unknown Error');
-      navigate(Routes.Login);
+      setLoggingIn(false);
     }
   };
 
@@ -140,7 +139,7 @@ const Login = () => {
             </>
           )}
 
-          {!waitingForBackend && <Button label="Login" type="submit" />}
+          {!waitingForBackend && <Button label="Login" type="submit" disabled={loggingIn} />}
         </form>
 
         {waitedCount > 10 && (