diff --git a/public/frontend_login.js b/public/frontend_login.js
index bfd4b0c..0edd7bd 100644
--- a/public/frontend_login.js
+++ b/public/frontend_login.js
@@ -1,42 +1,89 @@
-document.addEventListener("DOMContentLoaded", () => {
+document.addEventListener("DOMContentLoaded", () => {
     const form = document.querySelector("form");
+    const registerButton = document.getElementById("register-button");
+    const loginButton = document.getElementById("login-button");
+    const authError = document.getElementById("auth-error");
+
+    form.addEventListener("submit", async (event) => {
+        event.preventDefault();
+        await authenticate("/login", "Login successful. Loading Lobby...");
+    });
+
+    registerButton.addEventListener("click", async () => {
+        await authenticate("/register", "Register successful. Loading Lobby...");
+    });
+
+    async function authenticate(endpoint, successMessage) {
+        clearAuthError();
+        setButtonsDisabled(true);
+
+        const credentials = {
+            username: form.username.value,
+            password: form.password.value
+        };
 
-    form.addEventListener("submit", async (e) => {
-        e.preventDefault();
-        const username = form.username.value;
-        const password = form.password.value;
-        const credentials = {username, password};
         try {
-            const loginRes = await fetch("/login", {
+            const response = await fetch(endpoint, {
                 method: "POST",
                 headers: {"Content-Type": "application/json"},
-                body: JSON.stringify(credentials),
+                credentials: "same-origin",
+                body: JSON.stringify(credentials)
             });
 
-            if (loginRes.ok) {
-                await loginRes.json();
-                showLoadingScreen("Login successful. Loading Lobby...");
+            const data = await readJsonResponse(response);
+            if (!response.ok) {
+                showAuthError(data.error || "Authentication failed.");
                 return;
             }
 
-            const registerRes = await fetch("/register", {
-                method: "POST",
-                headers: {"Content-Type": "application/json"},
-                body: JSON.stringify(credentials),
-            });
-
-            if (registerRes.ok) {
-                await registerRes.json();
-                showLoadingScreen("Register successful. Loading Lobby...");
-            } else {
-                const error = await registerRes.json();
-                alert("Register failed: " + (error.error || "Unknown error"));
+            const verified = await verifySession();
+            if (!verified) {
+                showAuthError("Login succeeded, but the browser did not send the session cookie back to the server.");
+                return;
             }
-        } catch (err) {
-            console.error("Network error:", err);
-            alert("Server unreachable.");
+
+            showLoadingScreen(successMessage);
+        } catch (error) {
+            console.error("Authentication request failed:", error);
+            showAuthError("Server unreachable.");
+        } finally {
+            setButtonsDisabled(false);
         }
-    });
+    }
+
+    async function verifySession() {
+        const response = await fetch("/verify", {
+            method: "POST",
+            credentials: "same-origin"
+        });
+        if (!response.ok) return false;
+
+        const data = await readJsonResponse(response);
+        return Boolean(data.valid && data.user?.username);
+    }
+
+    async function readJsonResponse(response) {
+        try {
+            return await response.json();
+        } catch {
+            return {};
+        }
+    }
+
+    function showAuthError(message) {
+        authError.textContent = message;
+        authError.classList.remove("hidden");
+    }
+
+    function clearAuthError() {
+        authError.textContent = "";
+        authError.classList.add("hidden");
+    }
+
+    function setButtonsDisabled(disabled) {
+        loginButton.disabled = disabled;
+        registerButton.disabled = disabled;
+    }
 
     function showLoadingScreen(message) {
         const loadingScreen = document.getElementById("loading-screen");
diff --git a/public/login.html b/public/login.html
index a060b9b..53f937d 100644
--- a/public/login.html
+++ b/public/login.html
@@ -11,7 +11,11 @@
 <form method="post" action="/login">
     <input type="text" name="username" placeholder="Username">
     <input type="password" name="password" placeholder="Password">
-    <button type="submit">Login</button>
+    <div class="auth-actions">
+        <button type="submit" id="login-button">Login</button>
+        <button type="button" id="register-button">Register</button>
+    </div>
+    <p id="auth-error" class="auth-error hidden"></p>
 </form>
 <div id="loading-screen" class="hidden">
     <div class="loading-text" id="loading-text">Loading...</div>
@@ -21,4 +25,4 @@
 </div>
 </body>
 <script src="frontend_login.js"></script>
-</html>
\ No newline at end of file
+</html>
diff --git a/public/styles_login.css b/public/styles_login.css
index ad7f9dd..3dd531f 100644
--- a/public/styles_login.css
+++ b/public/styles_login.css
@@ -63,6 +63,25 @@ button:hover {
     background: #1f1;
 }
 
+button:disabled {
+    cursor: not-allowed;
+    opacity: 0.6;
+}
+
+.auth-actions {
+    display: grid;
+    grid-template-columns: 1fr 1fr;
+    gap: 10px;
+}
+
+.auth-error {
+    color: #ff6b6b;
+    font-size: 14px;
+    line-height: 1.4;
+    margin: 0;
+    text-align: center;
+}
+
 .hidden {
     display: none !important;
 }