diff --git a/Overlord-Server/public/assets/build.js b/Overlord-Server/public/assets/build.js
index d35474e..b48b704 100644
--- a/Overlord-Server/public/assets/build.js
+++ b/Overlord-Server/public/assets/build.js
@@ -824,7 +824,7 @@ async function init() {
     });
 
     if (!res.ok) {
-      window.location.href = "/login.html";
+      window.location.href = "/";
       return;
     }
 
@@ -888,7 +888,7 @@ async function init() {
     await loadSavedBuilds();
   } catch (err) {
     console.error("Failed to fetch user info:", err);
-    window.location.href = "/login.html";
+    window.location.href = "/";
   }
 }
 
diff --git a/Overlord-Server/public/assets/deploy.js b/Overlord-Server/public/assets/deploy.js
index cff4de0..f60ec8f 100644
--- a/Overlord-Server/public/assets/deploy.js
+++ b/Overlord-Server/public/assets/deploy.js
@@ -56,7 +56,7 @@ async function checkAuth() {
   try {
     const res = await fetch("/api/auth/me");
     if (!res.ok) {
-      window.location.href = "/login.html";
+      window.location.href = "/";
       return;
     }
 
@@ -110,7 +110,7 @@ async function checkAuth() {
     }
   } catch (err) {
     console.error("Auth check failed:", err);
-    window.location.href = "/login.html";
+    window.location.href = "/";
   }
 }
 
diff --git a/Overlord-Server/public/assets/feature-gate.js b/Overlord-Server/public/assets/feature-gate.js
index 36c2e71..3c8b09b 100644
--- a/Overlord-Server/public/assets/feature-gate.js
+++ b/Overlord-Server/public/assets/feature-gate.js
@@ -14,7 +14,7 @@ export async function checkFeatureAccess(feature, clientId) {
     const res = await fetch(`/api/auth/feature-check?${params}`, { credentials: "include" });
 
     if (res.status === 401) {
-      window.location.href = "/login.html";
+      window.location.href = "/";
       return false;
     }
 
diff --git a/Overlord-Server/public/assets/main.js b/Overlord-Server/public/assets/main.js
index c51a2cc..d40d420 100644
--- a/Overlord-Server/public/assets/main.js
+++ b/Overlord-Server/public/assets/main.js
@@ -302,7 +302,7 @@ async function loadCurrentUser() {
 
       initializeRenderer();
     } else {
-      window.location.href = "/login.html";
+      window.location.href = "/";
     }
   } catch (err) {
     console.error("Failed to load user:", err);
diff --git a/Overlord-Server/public/assets/metrics.js b/Overlord-Server/public/assets/metrics.js
index d66a028..d6280b4 100644
--- a/Overlord-Server/public/assets/metrics.js
+++ b/Overlord-Server/public/assets/metrics.js
@@ -480,7 +480,7 @@ async function fetchMetrics() {
     });
 
     if (response.status === 401) {
-      window.location.href = "/login.html";
+      window.location.href = "/";
       return;
     }
 
@@ -503,7 +503,7 @@ async function checkAuth() {
   try {
     const res = await fetch("/api/auth/me", { credentials: "include" });
     if (!res.ok) {
-      window.location.href = "/login.html";
+      window.location.href = "/";
       return;
     }
 
@@ -559,7 +559,7 @@ async function checkAuth() {
     }
   } catch (err) {
     console.error("Auth check failed:", err);
-    window.location.href = "/login.html";
+    window.location.href = "/";
   }
 }
 
diff --git a/Overlord-Server/public/assets/plugins.js b/Overlord-Server/public/assets/plugins.js
index 3ddd0d9..f4b21df 100644
--- a/Overlord-Server/public/assets/plugins.js
+++ b/Overlord-Server/public/assets/plugins.js
@@ -8,7 +8,7 @@ async function checkAuth() {
   try {
     const res = await fetch("/api/auth/me", { credentials: "include" });
     if (!res.ok) {
-      window.location.href = "/login.html";
+      window.location.href = "/";
       return;
     }
 
@@ -69,7 +69,7 @@ async function checkAuth() {
     }
   } catch (err) {
     console.error("Auth check failed:", err);
-    window.location.href = "/login.html";
+    window.location.href = "/";
   }
 }
 
diff --git a/Overlord-Server/public/assets/scripts.js b/Overlord-Server/public/assets/scripts.js
index 9a4ebc9..91a2e06 100644
--- a/Overlord-Server/public/assets/scripts.js
+++ b/Overlord-Server/public/assets/scripts.js
@@ -58,7 +58,7 @@ async function checkAuth() {
   try {
     const res = await fetch("/api/auth/me");
     if (!res.ok) {
-      window.location.href = "/login.html";
+      window.location.href = "/";
       return;
     }
 
@@ -123,7 +123,7 @@ async function checkAuth() {
     }
   } catch (err) {
     console.error("Auth check failed:", err);
-    window.location.href = "/login.html";
+    window.location.href = "/";
   }
 }
 
diff --git a/Overlord-Server/public/assets/settings.js b/Overlord-Server/public/assets/settings.js
index f43083b..016f73d 100644
--- a/Overlord-Server/public/assets/settings.js
+++ b/Overlord-Server/public/assets/settings.js
@@ -307,7 +307,7 @@ function loadPrefs() {
 async function loadCurrentUser() {
   const res = await fetch("/api/auth/me", { credentials: "include" });
   if (!res.ok) {
-    window.location.href = "/login.html";
+    window.location.href = "/";
     return;
   }
 
@@ -960,7 +960,7 @@ async function handleRevokeSessionClick(event) {
     }
 
     if (isCurrent) {
-      window.location.href = "/login.html";
+      window.location.href = "/";
       return;
     }
 
diff --git a/Overlord-Server/public/assets/user-client-access.js b/Overlord-Server/public/assets/user-client-access.js
index a7a6c26..cb4f736 100644
--- a/Overlord-Server/public/assets/user-client-access.js
+++ b/Overlord-Server/public/assets/user-client-access.js
@@ -146,7 +146,7 @@ function renderClients() {
 async function loadCurrentUser() {
   const res = await fetch("/api/auth/me", { credentials: "include" });
   if (!res.ok) {
-    window.location.href = "/login.html";
+    window.location.href = "/";
     return;
   }
   state.me = await res.json();
diff --git a/Overlord-Server/public/assets/users.js b/Overlord-Server/public/assets/users.js
index 18fc36a..4db2388 100644
--- a/Overlord-Server/public/assets/users.js
+++ b/Overlord-Server/public/assets/users.js
@@ -77,11 +77,11 @@ async function getCurrentUser() {
         window.location.href = "/";
       }
     } else {
-      window.location.href = "/login.html";
+      window.location.href = "/";
     }
   } catch (err) {
     console.error("Failed to get current user:", err);
-    window.location.href = "/login.html";
+    window.location.href = "/";
   }
 }
 
diff --git a/Overlord-Server/public/assets/winre.js b/Overlord-Server/public/assets/winre.js
index e2d1fee..e118670 100644
--- a/Overlord-Server/public/assets/winre.js
+++ b/Overlord-Server/public/assets/winre.js
@@ -50,7 +50,7 @@ async function checkAuth() {
   try {
     const res = await fetch("/api/auth/me");
     if (!res.ok) {
-      window.location.href = "/login.html";
+      window.location.href = "/";
       return;
     }
 
@@ -83,7 +83,7 @@ async function checkAuth() {
     }
   } catch (err) {
     console.error("Auth check failed:", err);
-    window.location.href = "/login.html";
+    window.location.href = "/";
   }
 }
 
diff --git a/Overlord-Server/public/settings.html b/Overlord-Server/public/settings.html
index e551273..13162aa 100644
--- a/Overlord-Server/public/settings.html
+++ b/Overlord-Server/public/settings.html
@@ -155,8 +155,8 @@
             </div>
           </div>
 
-          <form id="password-form" class="space-y-3">
-            <p class="text-xs font-semibold uppercase tracking-wider text-slate-500">Change Password</p>
+          <form id="password-form" class="space-y-3 mt-2 pt-4 border-t border-slate-800">
+            <p class="text-xs font-semibold uppercase tracking-wider text-slate-500 pb-1">Change Password</p>
             <input
               id="current-password"
               type="password"
@@ -183,7 +183,9 @@
               class="w-full px-3 py-2 rounded-lg bg-slate-900 border border-slate-700 focus:outline-none focus:ring-2 focus:ring-sky-500"
               required
             />
-            <p id="password-policy-hint" class="text-xs text-slate-400"></p>
+            <div class="pt-1">
+              <p id="password-policy-hint" class="text-xs text-slate-400 mb-3"></p>
+            </div>
             <button
               type="submit"
               class="inline-flex items-center gap-2 px-4 py-2 rounded-lg bg-sky-600 hover:bg-sky-500 transition-colors text-white text-sm font-medium"