diff --git a/docs/designs/login.html b/docs/designs/login.html
index 8d445f5..6baff51 100644
--- a/docs/designs/login.html
+++ b/docs/designs/login.html
@@ -14,29 +14,61 @@
       min-height: 100vh;
       display: flex;
       flex-direction: column;
-      justify-content: center;
-      padding: 24px;
       background: linear-gradient(180deg, var(--bg) 0%, var(--surface) 100%);
     }
 
-    .login-header {
-      text-align: center;
-      margin-bottom: 48px;
+    .app-bar {
+      display: flex;
+      align-items: center;
+      justify-content: flex-end;
+      padding: 8px 8px 0;
+      min-height: 56px;
     }
 
-    .logo {
-      width: 80px;
-      height: 80px;
+    .icon-btn {
+      width: 40px;
+      height: 40px;
+      border: none;
+      background: transparent;
+      border-radius: 50%;
+      cursor: pointer;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      color: var(--text-primary);
+      transition: background 0.15s;
+    }
+    .icon-btn:hover { background: var(--surface-variant); }
+    .icon-btn svg { width: 22px; height: 22px; }
+
+    .login-body {
+      flex: 1;
+      display: flex;
+      justify-content: center;
+      overflow-y: auto;
+      padding: 0 24px 24px;
+    }
+
+    .login-content {
+      width: 100%;
+      max-width: 440px;
+      display: flex;
+      flex-direction: column;
+    }
+
+    .logo-card {
+      width: 88px;
+      height: 88px;
       background: linear-gradient(135deg, var(--accent-primary) 0%, var(--accent-secondary) 100%);
-      border-radius: 20px;
-      margin: 0 auto 24px;
+      border-radius: 24px;
+      margin: 16px auto 0;
       display: flex;
       align-items: center;
       justify-content: center;
-      box-shadow: 0 8px 32px rgba(0, 102, 255, 0.25);
+      box-shadow: 0 12px 28px rgba(0, 102, 255, 0.24);
     }
 
-    .logo svg {
+    .logo-card svg {
       width: 44px;
       height: 44px;
       color: white;
@@ -46,31 +78,281 @@
       font-size: 32px;
       font-weight: 700;
       color: var(--text-primary);
-      margin-bottom: 8px;
+      text-align: center;
+      margin: 24px 0 0;
       letter-spacing: -0.5px;
     }
 
     .app-tagline {
       color: var(--text-secondary);
       font-size: 15px;
+      text-align: center;
+      margin: 8px 0 32px;
     }
 
-    .login-methods {
+    .provider-section {
       display: flex;
       flex-direction: column;
-      gap: 16px;
-      margin-bottom: 32px;
+      align-items: center;
+      gap: 8px;
+      margin-bottom: 20px;
     }
 
-    .divider-with-text {
+    .provider-label {
+      font-size: 13px;
+      font-weight: 600;
+      color: var(--text-primary);
+      text-transform: none;
+    }
+
+    .segmented-control {
+      display: flex;
+      background: var(--surface);
+      border: 1.5px solid var(--border);
+      border-radius: 50px;
+      padding: 3px;
+      gap: 2px;
+    }
+
+    .segment {
       display: flex;
       align-items: center;
-      gap: 16px;
-      margin: 24px 0;
+      gap: 6px;
+      padding: 8px 18px;
+      border-radius: 50px;
+      border: none;
+      background: transparent;
+      cursor: pointer;
+      font-size: 13px;
+      font-weight: 500;
+      color: var(--text-secondary);
+      font-family: inherit;
+      transition: background 0.15s, color 0.15s;
+    }
+
+    .segment.active {
+      background: var(--accent-primary);
+      color: #fff;
+    }
+
+    .segment svg {
+      width: 16px;
+      height: 16px;
+    }
+
+    .search-bar {
+      display: flex;
+      align-items: center;
+      border: 1.5px solid var(--border);
+      border-radius: 14px;
+      background: var(--bg);
+      transition: border-color 0.15s, box-shadow 0.15s;
+      overflow: visible;
+      margin-bottom: 0;
+    }
+
+    .search-bar:focus-within {
+      border-color: var(--accent-primary);
+      box-shadow: 0 0 0 3px rgba(0, 102, 255, 0.12);
+    }
+
+    .search-bar .input-icon {
+      flex-shrink: 0;
+      width: 20px;
+      height: 20px;
+      margin-left: 14px;
       color: var(--text-muted);
+    }
+
+    .search-bar .input {
+      flex: 1;
+      border: none !important;
+      outline: none !important;
+      background: transparent;
+      box-shadow: none !important;
+      padding: 14px 10px;
+      font-size: 15px;
+    }
+
+    .search-bar .input:focus {
+      border: none;
+      box-shadow: none;
+    }
+
+    .btn-continue {
+      flex-shrink: 0;
+      width: 40px;
+      height: 40px;
+      margin: 5px;
+      border-radius: 10px;
+      background: var(--accent-primary);
+      border: none;
+      color: white;
+      cursor: pointer;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      transition: background 0.15s, transform 0.1s;
+    }
+
+    .btn-continue:hover { background: var(--accent-primary-hover); }
+    .btn-continue:active { transform: scale(0.92); }
+    .btn-continue svg { width: 18px; height: 18px; }
+
+    .typeahead-wrapper {
+      position: relative;
+      margin-bottom: 20px;
+    }
+
+    .typeahead-dropdown {
+      position: absolute;
+      bottom: calc(100% + 6px);
+      left: 0;
+      right: 0;
+      background: var(--bg);
+      border: 1.5px solid var(--border);
+      border-radius: 12px;
+      box-shadow: 0 -4px 24px rgba(0,0,0,0.10);
+      z-index: 10;
+      overflow: hidden;
+    }
+
+    .typeahead-item {
+      display: flex;
+      align-items: center;
+      gap: 10px;
+      padding: 10px 14px;
+      cursor: pointer;
+      transition: background 0.1s;
+    }
+
+    .typeahead-item:hover { background: var(--surface); }
+
+    .typeahead-avatar {
+      width: 32px;
+      height: 32px;
+      border-radius: 50%;
+      background: var(--surface-variant);
+      flex-shrink: 0;
+      overflow: hidden;
+    }
+
+    .typeahead-avatar img {
+      width: 100%;
+      height: 100%;
+      object-fit: cover;
+    }
+
+    .typeahead-handle {
       font-size: 13px;
+      color: var(--text-primary);
       font-weight: 500;
+    }
+
+    .typeahead-display-name {
+      font-size: 12px;
+      color: var(--text-secondary);
+    }
+
+    .account-switcher {
+      margin-top: 28px;
+    }
+
+    .account-switcher-header {
+      font-size: 12px;
+      font-weight: 600;
+      color: var(--text-muted);
+      text-transform: uppercase;
+      letter-spacing: 0.06em;
+      margin-bottom: 10px;
+    }
+
+    .account-list {
+      display: flex;
+      flex-direction: column;
+      gap: 6px;
+    }
+
+    .account-item {
+      display: flex;
+      align-items: center;
+      gap: 12px;
+      padding: 12px 14px;
+      background: var(--surface);
+      border-radius: 12px;
+      cursor: pointer;
+      border: 1.5px solid transparent;
+      transition: border-color 0.15s, background 0.15s;
+    }
+
+    .account-item:hover {
+      border-color: var(--border);
+      background: var(--bg);
+    }
+
+    .account-avatar {
+      width: 40px;
+      height: 40px;
+      border-radius: 50%;
+      background: linear-gradient(135deg, var(--accent-primary), var(--accent-secondary));
+      flex-shrink: 0;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      color: white;
+      font-size: 15px;
+      font-weight: 700;
+    }
+
+    .account-info {
+      flex: 1;
+      min-width: 0;
+    }
+
+    .account-display-name {
+      font-size: 14px;
+      font-weight: 600;
+      color: var(--text-primary);
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
+    }
+
+    .account-handle {
+      font-size: 12px;
+      color: var(--text-secondary);
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
+    }
+
+    .account-remove {
+      width: 28px;
+      height: 28px;
+      border: none;
+      background: transparent;
+      border-radius: 50%;
+      cursor: pointer;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      color: var(--text-muted);
+      flex-shrink: 0;
+      transition: background 0.1s, color 0.1s;
+    }
+    .account-remove:hover { background: var(--surface-variant); color: var(--accent-error); }
+    .account-remove svg { width: 16px; height: 16px; }
+
+    .divider-with-text {
+      display: flex;
+      align-items: center;
+      gap: 16px;
+      margin: 24px 0 16px;
+      color: var(--text-muted);
+      font-size: 12px;
+      font-weight: 600;
       text-transform: uppercase;
+      letter-spacing: 0.06em;
     }
 
     .divider-with-text::before,
@@ -82,129 +364,311 @@
     }
 
     .debug-section {
-      background-color: var(--surface);
+      border: 1.5px solid var(--border);
       border-radius: 12px;
-      padding: 20px;
-      border: 1.5px dashed var(--border);
+      overflow: hidden;
     }
 
     .debug-header {
       display: flex;
       align-items: center;
       gap: 8px;
-      margin-bottom: 16px;
+      padding: 14px 16px;
+    }
+
+    .debug-icon {
+      color: var(--text-secondary);
     }
+    .debug-icon svg { width: 20px; height: 20px; }
 
     .debug-title {
       font-weight: 600;
       color: var(--text-primary);
       font-size: 15px;
+      flex: 1;
     }
 
-    .debug-form {
-      display: flex;
-      flex-direction: column;
-      gap: 12px;
+    .debug-toggle {
+      border: none;
+      background: transparent;
+      color: var(--accent-primary);
+      font-size: 14px;
+      font-weight: 500;
+      font-family: inherit;
+      cursor: pointer;
+      padding: 4px 8px;
+      border-radius: 6px;
+      transition: background 0.1s;
     }
+    .debug-toggle:hover { background: var(--surface); }
 
-    .input-group {
+    .debug-body {
+      padding: 0 16px 16px;
       display: flex;
       flex-direction: column;
-      gap: 6px;
+      gap: 12px;
     }
 
-    .input-label {
-      font-size: 13px;
-      font-weight: 500;
-      color: var(--text-secondary);
-      text-transform: uppercase;
-    }
+    .debug-body.hidden { display: none; }
 
     .help-text {
       font-size: 12px;
       color: var(--text-muted);
-      margin-top: 8px;
       text-align: center;
+      line-height: 1.5;
     }
 
     .login-footer {
-      text-align: center;
-      margin-top: auto;
-      padding-top: 32px;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      gap: 8px;
+      margin-top: 28px;
+      padding-bottom: 8px;
+      flex-wrap: wrap;
     }
 
-    .terms-text {
+    .footer-btn {
+      border: none;
+      background: transparent;
+      color: var(--accent-primary);
+      font-size: 13px;
+      font-weight: 500;
+      font-family: inherit;
+      cursor: pointer;
+      padding: 4px 8px;
+      border-radius: 6px;
+      transition: background 0.1s;
+    }
+    .footer-btn:hover { background: var(--surface); }
+
+    .footer-dot {
       font-size: 12px;
       color: var(--text-muted);
-      line-height: 1.6;
     }
   </style>
 </head>
 <body>
   <div class="mobile-container">
     <div class="login-screen">
-      <!-- Logo & Header -->
-      <div class="login-header">
-        <div class="logo">
+
+      <div class="app-bar">
+        <button class="icon-btn" title="Settings">
           <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
-            <path d="M12 2L2 7l10 5 10-5-10-5z"/>
-            <path d="M2 17l10 5 10-5"/>
-            <path d="M2 12l10 5 10-5"/>
+            <circle cx="12" cy="12" r="3"/>
+            <path d="M19.4 15a1.65 1.65 0 0 0 .33 1.82l.06.06a2 2 0 0 1-2.83 2.83l-.06-.06a1.65 1.65 0 0 0-1.82-.33 1.65 1.65 0 0 0-1 1.51V21a2 2 0 0 1-4 0v-.09A1.65 1.65 0 0 0 9 19.4a1.65 1.65 0 0 0-1.82.33l-.06.06a2 2 0 0 1-2.83-2.83l.06-.06A1.65 1.65 0 0 0 4.68 15a1.65 1.65 0 0 0-1.51-1H3a2 2 0 0 1 0-4h.09A1.65 1.65 0 0 0 4.6 9a1.65 1.65 0 0 0-.33-1.82l-.06-.06a2 2 0 0 1 2.83-2.83l.06.06A1.65 1.65 0 0 0 9 4.68a1.65 1.65 0 0 0 1-1.51V3a2 2 0 0 1 4 0v.09a1.65 1.65 0 0 0 1 1.51 1.65 1.65 0 0 0 1.82-.33l.06-.06a2 2 0 0 1 2.83 2.83l-.06.06A1.65 1.65 0 0 0 19.4 9a1.65 1.65 0 0 0 1.51 1H21a2 2 0 0 1 0 4h-.09a1.65 1.65 0 0 0-1.51 1z"/>
           </svg>
-        </div>
-        <h1 class="app-name">Lazurite</h1>
-        <p class="app-tagline">Roam the ATmosphere</p>
+        </button>
       </div>
 
-      <!-- Login Methods -->
-      <div class="login-methods">
-        <!-- OAuth 2.0 Login -->
-        <button class="oauth-btn">
-          <svg viewBox="0 0 24 24" fill="currentColor">
-            <path d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm-1 17.93c-3.95-.49-7-3.85-7-7.93 0-.62.08-1.21.21-1.79L9 15v1c0 1.1.9 2 2 2v1.93zm6.9-2.54c-.26-.81-1-1.39-1.9-1.39h-1v-3c0-.55-.45-1-1-1H8v-2h2c.55 0 1-.45 1-1V7h2c1.1 0 2-.9 2-2v-.41c2.93 1.19 5 4.06 5 7.41 0 2.08-.8 3.97-2.1 5.39z"/>
-          </svg>
-          Continue
-        </button>
+      <div class="login-body">
+        <div class="login-content">
+
+          <div class="logo-card">
+            <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+              <path d="M12 2L2 7l10 5 10-5-10-5z"/>
+              <path d="M2 17l10 5 10-5"/>
+              <path d="M2 12l10 5 10-5"/>
+            </svg>
+          </div>
 
-        <div class="divider-with-text">Or</div>
+          <h1 class="app-name">Lazurite</h1>
+          <p class="app-tagline">Roam the ATmosphere</p>
 
-        <!-- Debug Mode - App Password -->
-        <div class="debug-section">
-          <div class="debug-header">
-            <span class="debug-badge">Debug Mode</span>
-            <span class="debug-title">App Password Login</span>
+          <div class="provider-section">
+            <span class="provider-label">Choose your portal</span>
+            <div class="segmented-control">
+              <button class="segment active" onclick="selectProvider(this, 'bluesky')">
+                <svg viewBox="0 0 24 24" fill="currentColor">
+                  <path d="M12 2C6.477 2 2 6.477 2 12s4.477 10 10 10 10-4.477 10-10S17.523 2 12 2zm0 2c4.418 0 8 3.582 8 8s-3.582 8-8 8-8-3.582-8-8 3.582-8 8-8z"/>
+                </svg>
+                BlueSky
+              </button>
+              <button class="segment" onclick="selectProvider(this, 'blacksky')">
+                <svg viewBox="0 0 24 24" fill="currentColor">
+                  <circle cx="12" cy="12" r="8"/>
+                </svg>
+                BlackSky
+              </button>
+            </div>
           </div>
 
-          <form class="debug-form">
-            <div class="input-group">
-              <label class="input-label">Handle or DID</label>
-              <input type="text" class="input" placeholder="@username.bsky.social">
+          <div class="typeahead-wrapper">
+            <div class="typeahead-dropdown" id="typeahead-dropdown" style="display:none;">
+              <div class="typeahead-item" onclick="selectHandle('alice.bsky.social')">
+                <div class="typeahead-avatar">
+                  <svg viewBox="0 0 24 24" fill="currentColor" width="32" height="32">
+                    <circle cx="12" cy="8" r="4" fill="var(--text-muted)"/>
+                    <path d="M4 20c0-4 3.6-7 8-7s8 3 8 7" fill="var(--text-muted)"/>
+                  </svg>
+                </div>
+                <div>
+                  <div class="typeahead-handle">alice.bsky.social</div>
+                  <div class="typeahead-display-name">Alice</div>
+                </div>
+              </div>
+              <div class="typeahead-item" onclick="selectHandle('alice.arts.bsky.social')">
+                <div class="typeahead-avatar">
+                  <svg viewBox="0 0 24 24" fill="currentColor" width="32" height="32">
+                    <circle cx="12" cy="8" r="4" fill="var(--text-muted)"/>
+                    <path d="M4 20c0-4 3.6-7 8-7s8 3 8 7" fill="var(--text-muted)"/>
+                  </svg>
+                </div>
+                <div>
+                  <div class="typeahead-handle">alice.arts.bsky.social</div>
+                  <div class="typeahead-display-name">Alice Arts</div>
+                </div>
+              </div>
             </div>
 
-            <div class="input-group">
-              <label class="input-label">App Password</label>
-              <input type="password" class="input" placeholder="xxxx-xxxx-xxxx-xxxx">
+            <div class="search-bar">
+              <svg class="input-icon" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+                <path d="M20 21v-2a4 4 0 0 0-4-4H8a4 4 0 0 0-4 4v2"/>
+                <circle cx="12" cy="7" r="4"/>
+              </svg>
+              <input
+                type="text"
+                class="input"
+                placeholder="username.bsky.social or did:plc:..."
+                id="handle-input"
+                autocomplete="off"
+                oninput="onHandleInput(this)"
+              >
+              <button class="btn-continue" id="continue-btn" title="Continue">
+                <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.5" stroke-linecap="round" stroke-linejoin="round">
+                  <line x1="5" y1="12" x2="19" y2="12"/>
+                  <polyline points="12 5 19 12 12 19"/>
+                </svg>
+              </button>
             </div>
+          </div>
 
-            <button type="submit" class="btn btn-primary">
-              Sign In
-            </button>
-          </form>
+          <div class="account-switcher">
+            <div class="account-switcher-header">Saved accounts</div>
+            <div class="account-list">
+              <div class="account-item" onclick="switchAccount('jay.bsky.social')">
+                <div class="account-avatar">J</div>
+                <div class="account-info">
+                  <div class="account-display-name">Jay</div>
+                  <div class="account-handle">jay.bsky.social</div>
+                </div>
+                <button class="account-remove" title="Remove account" onclick="removeAccount(event, 'jay.bsky.social')">
+                  <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+                    <line x1="18" y1="6" x2="6" y2="18"/>
+                    <line x1="6" y1="6" x2="18" y2="18"/>
+                  </svg>
+                </button>
+              </div>
+              <div class="account-item" onclick="switchAccount('rose.bsky.social')">
+                <div class="account-avatar" style="background: linear-gradient(135deg, #e879f9, #a21caf);">R</div>
+                <div class="account-info">
+                  <div class="account-display-name">Rose</div>
+                  <div class="account-handle">rose.bsky.social</div>
+                </div>
+                <button class="account-remove" title="Remove account" onclick="removeAccount(event, 'rose.bsky.social')">
+                  <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+                    <line x1="18" y1="6" x2="6" y2="18"/>
+                    <line x1="6" y1="6" x2="18" y2="18"/>
+                  </svg>
+                </button>
+              </div>
+            </div>
+          </div>
 
-          <p class="help-text">
-            App passwords can be generated in BlueSky Settings → App Passwords
-          </p>
-        </div>
-      </div>
+          <div class="divider-with-text">Debug</div>
+
+          <div class="debug-section">
+            <div class="debug-header">
+              <span class="debug-icon">
+                <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+                  <path d="M12 22c1.1 0 2-.9 2-2h-4c0 1.1.9 2 2 2zm6-6v-5c0-3.07-1.63-5.64-4.5-6.32V4c0-.83-.67-1.5-1.5-1.5s-1.5.67-1.5 1.5v.68C7.64 5.36 6 7.92 6 11v5l-2 2v1h16v-1l-2-2z"/>
+                </svg>
+              </span>
+              <span class="debug-title">App Password Login</span>
+              <button class="debug-toggle" id="debug-toggle" onclick="toggleDebug()">Show</button>
+            </div>
+            <div class="debug-body hidden" id="debug-body">
+              <div class="input-group" style="margin-bottom:0; margin-top:0;">
+                <div class="input-with-icon">
+                  <svg class="input-icon" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+                    <rect x="3" y="11" width="18" height="11" rx="2" ry="2"/>
+                    <path d="M7 11V7a5 5 0 0 1 10 0v4"/>
+                  </svg>
+                  <input type="password" class="input" placeholder="xxxx-xxxx-xxxx-xxxx">
+                </div>
+              </div>
+              <button class="btn btn-secondary" style="width:100%; display:flex; align-items:center; justify-content:center; gap:8px;">
+                <svg width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+                  <path d="M15 3h4a2 2 0 0 1 2 2v14a2 2 0 0 1-2 2h-4"/>
+                  <polyline points="10 17 15 12 10 7"/>
+                  <line x1="15" y1="12" x2="3" y2="12"/>
+                </svg>
+                Sign In
+              </button>
+              <p class="help-text">
+                Can be generated via BlueSky's App Passwords section at bsky.app.
+              </p>
+            </div>
+          </div>
+
+          <div class="login-footer">
+            <button class="footer-btn">Terms of Service</button>
+            <span class="footer-dot">•</span>
+            <button class="footer-btn">Privacy Policy</button>
+          </div>
 
-      <!-- Footer -->
-      <div class="login-footer">
-        <p class="terms-text">
-          By continuing, you agree to BlueSky's<br>
-          <a href="#" class="link">Terms of Service</a> and <a href="#" class="link">Privacy Policy</a>
-        </p>
+        </div>
       </div>
     </div>
   </div>
+
+  <script>
+    function selectProvider(btn, provider) {
+      document.querySelectorAll('.segment').forEach(s => s.classList.remove('active'));
+      btn.classList.add('active');
+    }
+
+    let debounceTimer;
+    function onHandleInput(input) {
+      clearTimeout(debounceTimer);
+      debounceTimer = setTimeout(() => {
+        const dropdown = document.getElementById('typeahead-dropdown');
+        dropdown.style.display = input.value.length >= 2 ? 'block' : 'none';
+      }, 300);
+    }
+
+    function selectHandle(handle) {
+      document.getElementById('handle-input').value = handle;
+      document.getElementById('typeahead-dropdown').style.display = 'none';
+    }
+
+    function toggleDebug() {
+      const body = document.getElementById('debug-body');
+      const toggle = document.getElementById('debug-toggle');
+      const hidden = body.classList.toggle('hidden');
+      toggle.textContent = hidden ? 'Show' : 'Hide';
+    }
+
+    function switchAccount(handle) {
+      document.getElementById('handle-input').value = handle;
+    }
+
+    function removeAccount(event, handle) {
+      event.stopPropagation();
+      const item = event.currentTarget.closest('.account-item');
+      item.remove();
+      const list = document.querySelector('.account-list');
+      if (!list.children.length) {
+        document.querySelector('.account-switcher').remove();
+      }
+    }
+
+    // Close typeahead on outside click
+    document.addEventListener('click', (e) => {
+      if (!e.target.closest('.typeahead-wrapper')) {
+        document.getElementById('typeahead-dropdown').style.display = 'none';
+      }
+    });
+  </script>
 </body>
 </html>
diff --git a/lib/core/router/app_router.dart b/lib/core/router/app_router.dart
index 1a1ccfc..787474b 100644
--- a/lib/core/router/app_router.dart
+++ b/lib/core/router/app_router.dart
@@ -130,7 +130,19 @@ class AppRouter {
       return null;
     },
     routes: [
-      GoRoute(path: '/login', pageBuilder: (context, state) => _page(context, state, const LoginScreen())),
+      GoRoute(
+        path: '/login',
+        pageBuilder: (context, state) {
+          final initialHandle = state.uri.queryParameters['handle']?.trim();
+          final hasInitialHandle = initialHandle != null && initialHandle.isNotEmpty;
+          final autoStartOAuth = state.uri.queryParameters['reauth'] == '1' && hasInitialHandle;
+          return _page(
+            context,
+            state,
+            LoginScreen(initialHandle: hasInitialHandle ? initialHandle : null, autoStartOAuth: autoStartOAuth),
+          );
+        },
+      ),
       GoRoute(
         path: '/settings',
         pageBuilder: (context, state) => _page(context, state, const SettingsScreen()),
diff --git a/lib/features/account/presentation/account_switcher_sheet.dart b/lib/features/account/presentation/account_switcher_sheet.dart
index 05a1422..b128c14 100644
--- a/lib/features/account/presentation/account_switcher_sheet.dart
+++ b/lib/features/account/presentation/account_switcher_sheet.dart
@@ -3,6 +3,7 @@ import 'dart:async';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:go_router/go_router.dart';
+import 'package:lazurite/core/database/app_database.dart';
 import 'package:lazurite/features/account/cubit/account_switcher_cubit.dart';
 import 'package:lazurite/features/auth/bloc/auth_bloc.dart';
 import 'package:lazurite/features/auth/data/atproto_identifier.dart';
@@ -21,12 +22,8 @@ String? validateAtProtoIdentifierInput(String? value) {
     return null;
   }
 
-  return switch (validationError.code) {
-    AtProtoIdentifierValidationErrorCode.empty => 'Enter a Bluesky handle or DID',
-    AtProtoIdentifierValidationErrorCode.unsupportedDid => 'Use a did:plc:... or did:web:... identifier',
-    AtProtoIdentifierValidationErrorCode.invalidDid => 'Enter a complete DID like did:plc:... or did:web:...',
-    AtProtoIdentifierValidationErrorCode.invalidHandle => 'Enter a full handle like username.bsky.social',
-  };
+  final code = validationError.code;
+  return code.message;
 }
 
 void showAccountSwitcherSheet(BuildContext context) {
@@ -108,7 +105,7 @@ class _AccountSwitcherSheet extends StatelessWidget {
                         ),
                       ],
                     ),
-                    onTap: isActive ? null : () => _onSwitchAccount(context, account.did),
+                    onTap: isActive ? null : () => _onSwitchAccount(context, account),
                   );
                 },
               );
@@ -141,10 +138,10 @@ class _AccountSwitcherSheet extends StatelessWidget {
     ),
   );
 
-  Future<void> _onSwitchAccount(BuildContext context, String did) async {
+  Future<void> _onSwitchAccount(BuildContext context, Account account) async {
     final cubit = context.read<AccountSwitcherCubit>();
     Navigator.pop(context);
-    final tokens = await cubit.switchAccount(did);
+    final tokens = await cubit.switchAccount(account.did);
     if (tokens != null) {
       authBloc.add(SessionRestored(tokens: tokens));
       return;
@@ -154,11 +151,14 @@ class _AccountSwitcherSheet extends StatelessWidget {
       showAppSnackBar(parentContext, 'Please sign in again for that account.');
       final router = GoRouter.maybeOf(parentContext);
       if (router != null) {
-        unawaited(Future<void>.delayed(Duration.zero, () => router.go('/login?reauth=1')));
+        unawaited(Future<void>.delayed(Duration.zero, () => router.go(_reauthLoginLocation(account.handle))));
       }
     }
   }
 
+  String _reauthLoginLocation(String handle) =>
+      Uri(path: '/login', queryParameters: {'reauth': '1', 'handle': handle}).toString();
+
   Future<void> _onAddAccount(BuildContext context) async {
     final cubit = context.read<AccountSwitcherCubit>();
     Navigator.pop(context);
diff --git a/lib/features/auth/data/atproto_identifier.dart b/lib/features/auth/data/atproto_identifier.dart
index 3fb8b26..57edbff 100644
--- a/lib/features/auth/data/atproto_identifier.dart
+++ b/lib/features/auth/data/atproto_identifier.dart
@@ -1,6 +1,18 @@
 import 'package:flutter/foundation.dart';
 
-enum AtProtoIdentifierValidationErrorCode { empty, unsupportedDid, invalidDid, invalidHandle }
+enum AtProtoIdentifierValidationErrorCode {
+  empty,
+  unsupportedDid,
+  invalidDid,
+  invalidHandle;
+
+  String get message => switch (this) {
+    AtProtoIdentifierValidationErrorCode.empty => 'Enter a Bluesky handle or DID',
+    AtProtoIdentifierValidationErrorCode.unsupportedDid => 'Use a did:plc:... or did:web:... identifier',
+    AtProtoIdentifierValidationErrorCode.invalidDid => 'Enter a complete DID like did:plc:... or did:web:...',
+    AtProtoIdentifierValidationErrorCode.invalidHandle => 'Enter a full handle like username.bsky.social',
+  };
+}
 
 class AtProtoIdentifierValidationError {
   const AtProtoIdentifierValidationError(this.code);
diff --git a/lib/features/auth/data/auth_repository.dart b/lib/features/auth/data/auth_repository.dart
index bfd3ae8..f34bdd0 100644
--- a/lib/features/auth/data/auth_repository.dart
+++ b/lib/features/auth/data/auth_repository.dart
@@ -463,7 +463,11 @@ class AuthRepository {
         await atp.deleteSession(refreshJwt: storedSession!.refreshToken!, service: storedSession.service);
       }
     } finally {
-      await clearSession();
+      if (storedSession != null) {
+        await _invalidateSession(storedSession);
+      } else {
+        await _database.deleteSetting(AppDatabase.activeAccountDidSettingKey);
+      }
       log.i('AuthRepository: Logout complete');
     }
   }
diff --git a/lib/features/auth/presentation/login_screen.dart b/lib/features/auth/presentation/login_screen.dart
index dd1fbbe..6959cb8 100644
--- a/lib/features/auth/presentation/login_screen.dart
+++ b/lib/features/auth/presentation/login_screen.dart
@@ -1,21 +1,28 @@
 import 'dart:async';
+import 'dart:convert';
 
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 import 'package:go_router/go_router.dart';
+import 'package:lazurite/core/database/app_database.dart';
 import 'package:lazurite/core/network/app_view_provider.dart';
+import 'package:lazurite/features/account/cubit/account_switcher_cubit.dart';
 import 'package:lazurite/features/auth/bloc/auth_bloc.dart';
+import 'package:lazurite/features/auth/data/atproto_identifier.dart';
 import 'package:lazurite/features/settings/bloc/settings_cubit.dart';
 import 'package:lazurite/features/settings/bloc/settings_state.dart';
 import 'package:lazurite/features/typeahead/data/typeahead_repository.dart';
 import 'package:lazurite/features/typeahead/data/typeahead_result.dart';
 import 'package:lazurite/features/typeahead/presentation/typeahead_text_field.dart';
+import 'package:lazurite/shared/presentation/widgets/profile_avatar.dart';
 
 class LoginScreen extends StatefulWidget {
-  const LoginScreen({this.typeaheadRepository, super.key});
+  const LoginScreen({this.initialHandle, this.autoStartOAuth = false, this.typeaheadRepository, super.key});
 
+  final String? initialHandle;
+  final bool autoStartOAuth;
   final TypeaheadRepository? typeaheadRepository;
 
   @override
@@ -26,15 +33,77 @@ class _LoginScreenState extends State<LoginScreen> {
   final _handleController = TextEditingController();
   final _appPasswordController = TextEditingController();
   final _formKey = GlobalKey<FormState>();
+  final Map<String, Future<String?>> _avatarFutureByDid = <String, Future<String?>>{};
   bool _showDebugForm = false;
   bool _isPersistingProvider = false;
+  bool _didRequestAccountsLoad = false;
+  bool _didRequestAutoOAuth = false;
+  bool _didLogMissingAccountSwitcherProvider = false;
+  bool _didLogAvatarLookupFailure = false;
   late final TypeaheadRepository _typeaheadRepository;
 
+  AccountSwitcherCubit? _maybeAccountSwitcherCubit(BuildContext context) {
+    try {
+      return context.read<AccountSwitcherCubit>();
+    } catch (_) {
+      if (kDebugMode && !_didLogMissingAccountSwitcherProvider) {
+        debugPrint('LoginScreen: AccountSwitcherCubit unavailable for login route.');
+        _didLogMissingAccountSwitcherProvider = true;
+      }
+      return null;
+    }
+  }
+
   @override
   void initState() {
     super.initState();
     _typeaheadRepository =
         widget.typeaheadRepository ?? TypeaheadRepository(provider: TypeaheadRepository.communityProvider);
+    final initialHandle = widget.initialHandle?.trim();
+    if (initialHandle != null && initialHandle.isNotEmpty) {
+      _handleController.text = initialHandle;
+      _handleController.selection = TextSelection.collapsed(offset: initialHandle.length);
+    }
+  }
+
+  @override
+  void didChangeDependencies() {
+    super.didChangeDependencies();
+    _requestAccountsLoadIfAvailable();
+    _requestAutoOAuthIfNeeded();
+  }
+
+  void _requestAccountsLoadIfAvailable() {
+    if (_didRequestAccountsLoad) {
+      return;
+    }
+
+    final accountSwitcherCubit = _maybeAccountSwitcherCubit(context);
+    if (accountSwitcherCubit == null) {
+      return;
+    }
+
+    _didRequestAccountsLoad = true;
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      if (!mounted) {
+        return;
+      }
+      unawaited(accountSwitcherCubit.loadAccounts());
+    });
+  }
+
+  void _requestAutoOAuthIfNeeded() {
+    if (_didRequestAutoOAuth || !widget.autoStartOAuth || _handleController.text.trim().isEmpty) {
+      return;
+    }
+
+    _didRequestAutoOAuth = true;
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      if (!mounted) {
+        return;
+      }
+      unawaited(_onOAuthLogin());
+    });
   }
 
   @override
@@ -49,6 +118,7 @@ class _LoginScreenState extends State<LoginScreen> {
       return;
     }
 
+    final handle = _normalizedIdentifierInput;
     final persisted = await _persistSelectedProvider();
     if (!persisted) {
       return;
@@ -56,7 +126,7 @@ class _LoginScreenState extends State<LoginScreen> {
     if (!mounted) {
       return;
     }
-    context.read<AuthBloc>().add(OAuthLoginRequested(handle: _handleController.text.trim()));
+    context.read<AuthBloc>().add(OAuthLoginRequested(handle: handle));
   }
 
   Future<void> _onAppPasswordLogin() async {
@@ -64,6 +134,7 @@ class _LoginScreenState extends State<LoginScreen> {
       return;
     }
 
+    final handle = _normalizedIdentifierInput;
     final persisted = await _persistSelectedProvider();
     if (!persisted) {
       return;
@@ -71,18 +142,50 @@ class _LoginScreenState extends State<LoginScreen> {
     if (!mounted) {
       return;
     }
-    context.read<AuthBloc>().add(
-      LoginRequested(handle: _handleController.text.trim(), appPassword: _appPasswordController.text.trim()),
-    );
+    context.read<AuthBloc>().add(LoginRequested(handle: handle, appPassword: _appPasswordController.text.trim()));
   }
 
   bool _isHandleValid() => _formKey.currentState?.validate() ?? false;
 
+  String get _normalizedIdentifierInput => normalizeAtProtoIdentifierForAuth(_handleController.text);
+
+  String? _validateIdentifierInput(String? value) {
+    final normalized = normalizeAtProtoIdentifierForAuth(value ?? '');
+    final validationError = validateAtProtoIdentifierForAuth(normalized);
+    return validationError?.code.message;
+  }
+
   void _onTypeaheadSelected(TypeaheadResult result) {
     _handleController.text = result.handle;
     unawaited(_onOAuthLogin());
   }
 
+  void _fillHandleFromAccount(Account account) {
+    _handleController.text = account.handle;
+    _handleController.selection = TextSelection.collapsed(offset: _handleController.text.length);
+  }
+
+  Future<void> _onSelectSavedAccount(Account account) async {
+    _fillHandleFromAccount(account);
+
+    final cubit = _maybeAccountSwitcherCubit(context);
+    if (cubit == null) {
+      return;
+    }
+
+    final tokens = await cubit.switchAccount(account.did);
+    if (!mounted) {
+      return;
+    }
+
+    if (tokens != null) {
+      context.read<AuthBloc>().add(SessionRestored(tokens: tokens));
+      return;
+    }
+
+    await _onOAuthLogin();
+  }
+
   Future<bool> _persistSelectedProvider() async {
     final settingsCubit = context.read<SettingsCubit>();
     if (_isPersistingProvider) {
@@ -111,10 +214,93 @@ class _LoginScreenState extends State<LoginScreen> {
     }
   }
 
+  Future<void> _onRemoveSavedAccount(Account account) async {
+    final cubit = _maybeAccountSwitcherCubit(context);
+    if (cubit == null) {
+      return;
+    }
+
+    final remove = await showDialog<bool>(
+      context: context,
+      builder: (dialogContext) => AlertDialog(
+        title: const Text('Remove Account'),
+        content: Text('Remove @${account.handle} from this device?'),
+        actions: [
+          TextButton(onPressed: () => Navigator.pop(dialogContext, false), child: const Text('Cancel')),
+          FilledButton(onPressed: () => Navigator.pop(dialogContext, true), child: const Text('Remove')),
+        ],
+      ),
+    );
+
+    if (remove != true) {
+      return;
+    }
+
+    final result = await cubit.removeAccount(account.did);
+    if (!result.removed) {
+      if (!mounted) {
+        return;
+      }
+      ScaffoldMessenger.of(context).showSnackBar(const SnackBar(content: Text('Unable to remove account right now.')));
+      return;
+    }
+
+    final switchedTokens = result.switchedTokens;
+    if (switchedTokens != null && mounted) {
+      context.read<AuthBloc>().add(SessionRestored(tokens: switchedTokens));
+    }
+
+    if (result.requiresSignIn && mounted) {
+      context.read<AuthBloc>().add(const SessionCleared());
+      final router = GoRouter.maybeOf(context);
+      if (router != null) {
+        router.go('/login?reauth=1');
+      }
+    }
+  }
+
+  Future<String?> _loadCachedAvatarUrlForDid(String did) async {
+    try {
+      final database = context.read<AppDatabase>();
+      final profile = await (database.select(
+        database.cachedProfiles,
+      )..where((profile) => profile.did.equals(did))).getSingleOrNull();
+      if (profile == null) {
+        return null;
+      }
+
+      final json = jsonDecode(profile.payload);
+      if (json is! Map<String, dynamic>) {
+        return null;
+      }
+
+      final avatar = json['avatar'];
+      if (avatar is String && avatar.isNotEmpty) {
+        return avatar;
+      }
+      return null;
+    } catch (_) {
+      if (kDebugMode && !_didLogAvatarLookupFailure) {
+        debugPrint('LoginScreen: cached avatar lookup unavailable.');
+        _didLogAvatarLookupFailure = true;
+      }
+      return null;
+    }
+  }
+
+  Future<String?> _avatarFutureForDid(String did) =>
+      _avatarFutureByDid.putIfAbsent(did, () => _loadCachedAvatarUrlForDid(did));
+
+  void _pruneAvatarFutureCache(Iterable<String> activeDids) {
+    final activeDidSet = activeDids.toSet();
+    _avatarFutureByDid.removeWhere((did, _) => !activeDidSet.contains(did));
+  }
+
   @override
   Widget build(BuildContext context) {
     final theme = Theme.of(context);
     final colorScheme = theme.colorScheme;
+    final accountSwitcherCubit = _maybeAccountSwitcherCubit(context);
 
     return Scaffold(
       appBar: AppBar(
@@ -206,50 +392,102 @@ class _LoginScreenState extends State<LoginScreen> {
                             );
                           },
                         ),
-                        TypeaheadTextField(
-                          controller: _handleController,
-                          repository: _typeaheadRepository,
-                          onSelected: _onTypeaheadSelected,
-                          minChars: 2,
-                          debounceMs: 300,
-                          limit: 8,
-                          decoration: const InputDecoration(
-                            labelText: 'Handle or DID',
-                            hintText: 'username.bsky.social or did:plc:...',
-                            prefixIcon: Icon(Icons.person_outline),
-                            border: OutlineInputBorder(),
-                          ),
-                          autocorrect: false,
-                          textInputAction: TextInputAction.next,
-                          validator: (value) {
-                            if (value == null || value.trim().isEmpty) {
-                              return 'Enter your BlueSky handle or DID';
-                            }
-                            return null;
-                          },
-                        ),
-                        const SizedBox(height: 20),
                         BlocBuilder<AuthBloc, AuthState>(
                           builder: (context, state) {
                             final busy = state.isLoading || _isPersistingProvider;
-                            return FilledButton.icon(
-                              onPressed: busy
-                                  ? null
-                                  : () {
-                                      unawaited(_onOAuthLogin());
-                                    },
-                              icon: busy
-                                  ? const SizedBox(
-                                      width: 18,
-                                      height: 18,
-                                      child: CircularProgressIndicator(strokeWidth: 2),
-                                    )
-                                  : const Icon(Icons.language),
-                              label: Text(busy ? 'Starting sign in...' : 'Continue'),
-                              style: FilledButton.styleFrom(padding: const EdgeInsets.symmetric(vertical: 18)),
+                            final border = OutlineInputBorder(
+                              borderRadius: BorderRadius.circular(14),
+                              borderSide: BorderSide(color: colorScheme.outlineVariant, width: 1.5),
+                            );
+
+                            return TypeaheadTextField(
+                              controller: _handleController,
+                              repository: _typeaheadRepository,
+                              onSelected: _onTypeaheadSelected,
+                              minChars: 2,
+                              debounceMs: 300,
+                              limit: 8,
+                              decoration: InputDecoration(
+                                labelText: 'Handle or DID',
+                                hintText: 'username.bsky.social or did:plc:...',
+                                prefixIcon: const Icon(Icons.person_outline),
+                                filled: true,
+                                fillColor: colorScheme.surface,
+                                contentPadding: const EdgeInsets.symmetric(vertical: 14, horizontal: 8),
+                                border: border,
+                                enabledBorder: border,
+                                focusedBorder: border.copyWith(
+                                  borderSide: BorderSide(color: colorScheme.primary, width: 1.5),
+                                ),
+                                suffixIconConstraints: const BoxConstraints(minWidth: 52, minHeight: 52),
+                                suffixIcon: Padding(
+                                  padding: const EdgeInsets.all(5),
+                                  child: Tooltip(
+                                    message: busy ? 'Starting sign in' : 'Continue',
+                                    child: Semantics(
+                                      label: busy ? 'Starting sign in' : 'Continue sign in',
+                                      button: true,
+                                      enabled: !busy,
+                                      child: FilledButton(
+                                        key: const ValueKey<String>('login-continue-button'),
+                                        onPressed: busy
+                                            ? null
+                                            : () {
+                                                unawaited(_onOAuthLogin());
+                                              },
+                                        style: FilledButton.styleFrom(
+                                          padding: EdgeInsets.zero,
+                                          minimumSize: const Size(40, 40),
+                                          maximumSize: const Size(40, 40),
+                                          shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(10)),
+                                        ),
+                                        child: busy
+                                            ? const SizedBox(
+                                                width: 18,
+                                                height: 18,
+                                                child: CircularProgressIndicator(strokeWidth: 2),
+                                              )
+                                            : const Icon(Icons.arrow_forward_rounded, size: 18),
+                                      ),
+                                    ),
+                                  ),
+                                ),
+                              ),
+                              autocorrect: false,
+                              textInputAction: TextInputAction.go,
+                              onFieldSubmitted: (_) => unawaited(_onOAuthLogin()),
+                              validator: _validateIdentifierInput,
                             );
                           },
                         ),
+                        const SizedBox(height: 16),
+                        if (accountSwitcherCubit != null)
+                          BlocProvider.value(
+                            value: accountSwitcherCubit,
+                            child: BlocBuilder<AccountSwitcherCubit, AccountSwitcherState>(
+                              builder: (context, state) {
+                                if (state.status == AccountSwitcherStatus.loading ||
+                                    state.status == AccountSwitcherStatus.initial) {
+                                  return const _SavedAccountsLoading();
+                                }
+
+                                if (state.accounts.isEmpty) {
+                                  return const SizedBox.shrink();
+                                }
+                                _pruneAvatarFutureCache(state.accounts.map((account) => account.did));
+                                return _SavedAccountsSection(
+                                  accounts: state.accounts,
+                                  avatarFutureForDid: _avatarFutureForDid,
+                                  onSelect: (account) {
+                                    unawaited(_onSelectSavedAccount(account));
+                                  },
+                                  onRemove: (account) {
+                                    unawaited(_onRemoveSavedAccount(account));
+                                  },
+                                );
+                              },
+                            ),
+                          ),
                         if (kDebugMode) ...[
                           const SizedBox(height: 24),
                           Row(
@@ -380,6 +618,122 @@ class _ProviderTabLabel extends StatelessWidget {
   );
 }
 
+class _SavedAccountsSection extends StatelessWidget {
+  const _SavedAccountsSection({
+    required this.accounts,
+    required this.avatarFutureForDid,
+    required this.onSelect,
+    required this.onRemove,
+  });
+
+  final List<Account> accounts;
+  final Future<String?> Function(String did) avatarFutureForDid;
+  final ValueChanged<Account> onSelect;
+  final ValueChanged<Account> onRemove;
+
+  @override
+  Widget build(BuildContext context) {
+    final theme = Theme.of(context);
+    final colorScheme = theme.colorScheme;
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.stretch,
+      children: [
+        Text('Saved accounts', style: theme.textTheme.labelLarge?.copyWith(fontWeight: FontWeight.w600)),
+        const SizedBox(height: 8),
+        DecoratedBox(
+          decoration: BoxDecoration(
+            color: colorScheme.surfaceContainerLowest,
+            borderRadius: BorderRadius.circular(14),
+            border: Border.all(color: colorScheme.outlineVariant),
+          ),
+          child: Column(
+            children: [
+              for (var index = 0; index < accounts.length; index++) ...[
+                _SavedAccountTile(
+                  key: ValueKey<String>('saved-account-${accounts[index].did}'),
+                  account: accounts[index],
+                  avatarFutureForDid: avatarFutureForDid,
+                  onTap: () => onSelect(accounts[index]),
+                  onRemove: () => onRemove(accounts[index]),
+                ),
+                if (index != accounts.length - 1) Divider(height: 1, color: colorScheme.outlineVariant),
+              ],
+            ],
+          ),
+        ),
+      ],
+    );
+  }
+}
+
+class _SavedAccountsLoading extends StatelessWidget {
+  const _SavedAccountsLoading();
+
+  @override
+  Widget build(BuildContext context) {
+    final theme = Theme.of(context);
+    final colorScheme = theme.colorScheme;
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.stretch,
+      children: [
+        Text('Saved accounts', style: theme.textTheme.labelLarge?.copyWith(fontWeight: FontWeight.w600)),
+        const SizedBox(height: 8),
+        DecoratedBox(
+          decoration: BoxDecoration(
+            color: colorScheme.surfaceContainerLowest,
+            borderRadius: BorderRadius.circular(14),
+            border: Border.all(color: colorScheme.outlineVariant),
+          ),
+          child: const Padding(
+            padding: EdgeInsets.symmetric(horizontal: 12, vertical: 10),
+            child: Row(
+              children: [
+                SizedBox(width: 16, height: 16, child: CircularProgressIndicator(strokeWidth: 2)),
+                SizedBox(width: 10),
+                Text('Loading saved accounts...'),
+              ],
+            ),
+          ),
+        ),
+      ],
+    );
+  }
+}
+
+class _SavedAccountTile extends StatelessWidget {
+  const _SavedAccountTile({
+    required this.account,
+    required this.avatarFutureForDid,
+    required this.onTap,
+    required this.onRemove,
+    super.key,
+  });
+
+  final Account account;
+  final Future<String?> Function(String did) avatarFutureForDid;
+  final VoidCallback onTap;
+  final VoidCallback onRemove;
+
+  @override
+  Widget build(BuildContext context) {
+    final label = account.displayName ?? account.handle;
+    return FutureBuilder<String?>(
+      future: avatarFutureForDid(account.did),
+      builder: (context, snapshot) {
+        return ListTile(
+          dense: true,
+          contentPadding: const EdgeInsets.symmetric(horizontal: 10, vertical: 2),
+          leading: ProfileAvatar(size: 36, fallbackText: label, imageUrl: snapshot.data),
+          title: Text(label, maxLines: 1, overflow: TextOverflow.ellipsis),
+          subtitle: Text('@${account.handle}', maxLines: 1, overflow: TextOverflow.ellipsis),
+          trailing: IconButton(tooltip: 'Remove account', icon: const Icon(Icons.close_rounded), onPressed: onRemove),
+          onTap: onTap,
+        );
+      },
+    );
+  }
+}
+
 class _LogoCard extends StatelessWidget {
   const _LogoCard({required this.colorScheme});
 
diff --git a/lib/features/typeahead/presentation/typeahead_text_field.dart b/lib/features/typeahead/presentation/typeahead_text_field.dart
index 6a41672..6dbdddc 100644
--- a/lib/features/typeahead/presentation/typeahead_text_field.dart
+++ b/lib/features/typeahead/presentation/typeahead_text_field.dart
@@ -45,6 +45,8 @@ class TypeaheadTextField extends StatefulWidget {
 }
 
 class _TypeaheadTextFieldState extends State<TypeaheadTextField> with WidgetsBindingObserver {
+  static const double _overlayGap = 6;
+
   final LayerLink _layerLink = LayerLink();
   final GlobalKey _fieldKey = GlobalKey();
   late FocusNode _focusNode;
@@ -230,7 +232,7 @@ class _TypeaheadTextFieldState extends State<TypeaheadTextField> with WidgetsBin
       child: CompositedTransformFollower(
         link: _layerLink,
         showWhenUnlinked: false,
-        offset: Offset(0, fieldSize.height + 4),
+        offset: Offset(0, fieldSize.height + _overlayGap),
         child: Align(
           alignment: Alignment.topLeft,
           child: TapRegion(
@@ -259,8 +261,9 @@ class _TypeaheadTextFieldState extends State<TypeaheadTextField> with WidgetsBin
 
   @override
   Widget build(BuildContext context) {
-    final resolvedDecoration = _isLoading
-        ? (widget.decoration ?? const InputDecoration()).copyWith(
+    final baseDecoration = widget.decoration ?? const InputDecoration();
+    final resolvedDecoration = _isLoading && baseDecoration.suffixIcon == null
+        ? baseDecoration.copyWith(
             suffixIcon: const Padding(
               padding: EdgeInsets.all(12),
               child: SizedBox(
diff --git a/test/core/router/app_router_test.dart b/test/core/router/app_router_test.dart
index fdc2f6a..ab7b72b 100644
--- a/test/core/router/app_router_test.dart
+++ b/test/core/router/app_router_test.dart
@@ -122,6 +122,7 @@ void main() {
         useSystemTheme: false,
       ),
     );
+    when(() => settingsCubit.setAppViewProvider(any())).thenAnswer((_) async {});
     when(() => connectivityCubit.state).thenReturn(const ConnectivityState.online());
     when(() => accountSwitcherCubit.state).thenReturn(const AccountSwitcherState.ready(accounts: []));
     when(() => accountSwitcherCubit.loadAccounts()).thenAnswer((_) async {});
@@ -532,7 +533,7 @@ void main() {
     await tester.tap(find.byTooltip('Back'));
     await tester.pumpAndSettle();
 
-    expect(find.text('Continue'), findsOneWidget);
+    expect(find.byKey(const ValueKey<String>('login-continue-button')), findsOneWidget);
 
     router.dispose();
   });
@@ -581,7 +582,7 @@ void main() {
     router.go('/settings/video-limits');
     await tester.pumpAndSettle();
 
-    expect(find.text('Continue'), findsOneWidget);
+    expect(find.byKey(const ValueKey<String>('login-continue-button')), findsOneWidget);
 
     router.dispose();
   });
@@ -595,7 +596,23 @@ void main() {
     router.go('/login?reauth=1');
     await tester.pumpAndSettle();
 
-    expect(find.text('Continue'), findsOneWidget);
+    expect(find.byKey(const ValueKey<String>('login-continue-button')), findsOneWidget);
+
+    router.dispose();
+  });
+
+  testWidgets('reauth login route passes handle through and starts OAuth for that account', (tester) async {
+    final router = AppRouter(authBloc: authBloc).router;
+
+    await tester.pumpWidget(buildSubjectWithRouter(router));
+    await tester.pumpAndSettle();
+
+    router.go('/login?reauth=1&handle=alice.bsky.social');
+    await tester.pumpAndSettle();
+
+    final field = tester.widget<TextFormField>(find.byType(TextFormField).first);
+    expect(field.controller?.text, 'alice.bsky.social');
+    verify(() => authBloc.add(const OAuthLoginRequested(handle: 'alice.bsky.social'))).called(1);
 
     router.dispose();
   });
diff --git a/test/features/account/presentation/account_switcher_sheet_test.dart b/test/features/account/presentation/account_switcher_sheet_test.dart
index d25d433..b648861 100644
--- a/test/features/account/presentation/account_switcher_sheet_test.dart
+++ b/test/features/account/presentation/account_switcher_sheet_test.dart
@@ -2,6 +2,7 @@ import 'package:bloc_test/bloc_test.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:go_router/go_router.dart';
 import 'package:lazurite/core/database/app_database.dart';
 import 'package:lazurite/features/account/cubit/account_switcher_cubit.dart';
 import 'package:lazurite/features/account/presentation/account_switcher_sheet.dart';
@@ -81,6 +82,19 @@ void main() {
     );
   }
 
+  Widget buildSubjectWithRouter(GoRouter router) {
+    return MultiBlocProvider(
+      providers: [
+        BlocProvider<AuthBloc>.value(value: authBloc),
+        BlocProvider<AccountSwitcherCubit>.value(value: cubit),
+      ],
+      child: RepositoryProvider<TypeaheadRepository>.value(
+        value: typeaheadRepository,
+        child: MaterialApp.router(routerConfig: router),
+      ),
+    );
+  }
+
   Future<void> openSheet(WidgetTester tester) async {
     await tester.pumpWidget(buildSubject());
     await tester.tap(find.text('Open'));
@@ -207,6 +221,49 @@ void main() {
       verify(() => cubit.switchAccount('did:plc:user2')).called(1);
     });
 
+    testWidgets('reauth fallback routes to login with selected account handle', (tester) async {
+      late GoRouter router;
+      router = GoRouter(
+        routes: [
+          GoRoute(
+            path: '/',
+            builder: (context, state) => Scaffold(
+              body: TextButton(onPressed: () => showAccountSwitcherSheet(context), child: const Text('Open')),
+            ),
+          ),
+          GoRoute(
+            path: '/login',
+            builder: (context, state) => Scaffold(body: Text('reauth:${state.uri.queryParameters['handle'] ?? ''}')),
+          ),
+        ],
+      );
+      addTearDown(router.dispose);
+
+      when(() => cubit.state).thenReturn(
+        AccountSwitcherState.ready(
+          accounts: [
+            makeAccount(did: 'did:plc:user1', handle: 'alice.bsky.social'),
+            makeAccount(did: 'did:plc:user2', handle: 'bob.bsky.social'),
+          ],
+          activeDid: 'did:plc:user1',
+        ),
+      );
+      when(() => cubit.switchAccount('did:plc:user2')).thenAnswer((_) async => null);
+
+      await tester.pumpWidget(buildSubjectWithRouter(router));
+      await tester.tap(find.text('Open'));
+      await tester.pump();
+      await tester.pump(const Duration(milliseconds: 500));
+
+      await tester.tap(find.text('bob.bsky.social'));
+      await tester.pumpAndSettle();
+
+      expect(router.routeInformationProvider.value.uri.path, '/login');
+      expect(router.routeInformationProvider.value.uri.queryParameters['reauth'], '1');
+      expect(router.routeInformationProvider.value.uri.queryParameters['handle'], 'bob.bsky.social');
+      expect(find.text('reauth:bob.bsky.social'), findsOneWidget);
+    });
+
     testWidgets('tapping active account does nothing', (tester) async {
       when(() => cubit.state).thenReturn(
         AccountSwitcherState.ready(
diff --git a/test/features/auth/data/auth_repository_test.dart b/test/features/auth/data/auth_repository_test.dart
index 74d326c..c33889c 100644
--- a/test/features/auth/data/auth_repository_test.dart
+++ b/test/features/auth/data/auth_repository_test.dart
@@ -724,16 +724,48 @@ void main() {
     });
 
     group('logout', () {
-      test('should clear session', () async {
+      test('removes only the active account session', () async {
+        final account = Account(
+          did: 'did:plc:active',
+          handle: 'active.bsky.social',
+          service: null,
+          oauthService: null,
+          accessToken: 'access_token',
+          refreshToken: null,
+          dpopPublicKey: null,
+          dpopPrivateKey: null,
+          dpopNonce: null,
+          displayName: 'Active User',
+          expiresAt: null,
+          createdAt: DateTime.now(),
+          updatedAt: DateTime.now(),
+        );
+
+        when(() => mockDatabase.getActiveAccount()).thenAnswer((_) async => account);
+        when(() => mockDatabase.deleteAccount(account.did)).thenAnswer((_) async => 1);
+        when(
+          () => mockDatabase.getSetting(AppDatabase.activeAccountDidSettingKey),
+        ).thenAnswer((_) async => account.did);
+        when(() => mockDatabase.deleteSetting(AppDatabase.activeAccountDidSettingKey)).thenAnswer((_) async => 1);
+
+        await authRepository.logout();
+
+        verify(() => mockDatabase.getActiveAccount()).called(1);
+        verify(() => mockDatabase.deleteAccount(account.did)).called(1);
+        verify(() => mockDatabase.deleteSetting(AppDatabase.activeAccountDidSettingKey)).called(1);
+        verifyNever(() => mockDatabase.deleteAllAccounts());
+      });
+
+      test('clears stale active account setting when no active account exists', () async {
         when(() => mockDatabase.getActiveAccount()).thenAnswer((_) async => null);
-        when(() => mockDatabase.deleteAllAccounts()).thenAnswer((_) async => 1);
         when(() => mockDatabase.deleteSetting(AppDatabase.activeAccountDidSettingKey)).thenAnswer((_) async => 1);
 
         await authRepository.logout();
 
         verify(() => mockDatabase.getActiveAccount()).called(1);
-        verify(() => mockDatabase.deleteAllAccounts()).called(1);
         verify(() => mockDatabase.deleteSetting(AppDatabase.activeAccountDidSettingKey)).called(1);
+        verifyNever(() => mockDatabase.deleteAllAccounts());
+        verifyNever(() => mockDatabase.deleteAccount(any()));
       });
     });
 
diff --git a/test/features/auth/presentation/login_screen_test.dart b/test/features/auth/presentation/login_screen_test.dart
index 6ff767a..165b30d 100644
--- a/test/features/auth/presentation/login_screen_test.dart
+++ b/test/features/auth/presentation/login_screen_test.dart
@@ -1,11 +1,16 @@
+import 'dart:async';
+
 import 'package:bloc_test/bloc_test.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:go_router/go_router.dart';
+import 'package:lazurite/core/database/app_database.dart';
+import 'package:lazurite/features/account/cubit/account_switcher_cubit.dart';
 import 'package:lazurite/core/theme/app_theme.dart';
 import 'package:lazurite/features/auth/bloc/auth_bloc.dart';
+import 'package:lazurite/features/auth/data/models/auth_models.dart';
 import 'package:lazurite/features/settings/bloc/settings_cubit.dart';
 import 'package:lazurite/features/settings/bloc/settings_state.dart';
 import 'package:lazurite/features/auth/presentation/login_screen.dart';
@@ -17,13 +22,17 @@ class MockAuthBloc extends MockBloc<AuthEvent, AuthState> implements AuthBloc {}
 
 class MockSettingsCubit extends MockCubit<SettingsState> implements SettingsCubit {}
 
+class MockAccountSwitcherCubit extends MockCubit<AccountSwitcherState> implements AccountSwitcherCubit {}
+
 void main() {
   late MockAuthBloc authBloc;
   late MockSettingsCubit settingsCubit;
+  late MockAccountSwitcherCubit accountSwitcherCubit;
 
   setUp(() {
     authBloc = MockAuthBloc();
     settingsCubit = MockSettingsCubit();
+    accountSwitcherCubit = MockAccountSwitcherCubit();
     when(() => authBloc.state).thenReturn(const AuthState.unauthenticated());
     whenListen(authBloc, const Stream<AuthState>.empty(), initialState: const AuthState.unauthenticated());
     const settingsState = SettingsState(
@@ -34,9 +43,21 @@ void main() {
     when(() => settingsCubit.state).thenReturn(settingsState);
     whenListen(settingsCubit, const Stream<SettingsState>.empty(), initialState: settingsState);
     when(() => settingsCubit.setAppViewProvider(any())).thenAnswer((_) async {});
+    when(() => accountSwitcherCubit.state).thenReturn(const AccountSwitcherState.ready(accounts: []));
+    whenListen(
+      accountSwitcherCubit,
+      const Stream<AccountSwitcherState>.empty(),
+      initialState: const AccountSwitcherState.ready(accounts: []),
+    );
+    when(() => accountSwitcherCubit.loadAccounts()).thenAnswer((_) async {});
   });
 
-  Widget buildSubject({ThemeMode themeMode = ThemeMode.system}) {
+  Widget buildSubject({
+    ThemeMode themeMode = ThemeMode.system,
+    MockAccountSwitcherCubit? accountCubit,
+    String? initialHandle,
+    bool autoStartOAuth = false,
+  }) {
     final typeaheadRepository = _FakeTypeaheadRepository(
       searchHandler: ({required String query, int limit = 10}) async => const [],
     );
@@ -49,8 +70,13 @@ void main() {
             providers: [
               BlocProvider<AuthBloc>.value(value: authBloc),
               BlocProvider<SettingsCubit>.value(value: settingsCubit),
+              BlocProvider<AccountSwitcherCubit>.value(value: accountCubit ?? accountSwitcherCubit),
             ],
-            child: LoginScreen(typeaheadRepository: typeaheadRepository),
+            child: LoginScreen(
+              initialHandle: initialHandle,
+              autoStartOAuth: autoStartOAuth,
+              typeaheadRepository: typeaheadRepository,
+            ),
           ),
         ),
         GoRoute(
@@ -79,7 +105,8 @@ void main() {
 
   testWidgets('shows settings icon plus terms and privacy links', (tester) async {
     await tester.pumpWidget(buildSubject());
-    await tester.pumpAndSettle();
+    await tester.pump();
+    await tester.pump(const Duration(milliseconds: 200));
 
     final scrollable = find.byType(Scrollable).first;
     await tester.scrollUntilVisible(find.text('Terms of Service'), 200, scrollable: scrollable);
@@ -94,7 +121,8 @@ void main() {
 
   testWidgets('tapping settings icon opens public settings route', (tester) async {
     await tester.pumpWidget(buildSubject());
-    await tester.pumpAndSettle();
+    await tester.pump();
+    await tester.pump(const Duration(milliseconds: 200));
 
     await tester.tap(find.byTooltip('Settings'));
     await tester.pumpAndSettle();
@@ -104,7 +132,8 @@ void main() {
 
   testWidgets('tapping Terms of Service opens terms route', (tester) async {
     await tester.pumpWidget(buildSubject());
-    await tester.pumpAndSettle();
+    await tester.pump();
+    await tester.pump(const Duration(milliseconds: 200));
 
     await tester.scrollUntilVisible(find.text('Terms of Service'), 200, scrollable: find.byType(Scrollable).first);
     await tester.pumpAndSettle();
@@ -162,7 +191,10 @@ void main() {
     await tester.pumpAndSettle();
 
     expect(find.text('River Tam'), findsOneWidget);
-    await tester.tap(find.text('River Tam'));
+    final suggestionTile = tester.widget<ListTile>(
+      find.byKey(const ValueKey<String>('typeahead-result-did:plc:river')),
+    );
+    suggestionTile.onTap?.call();
     await tester.pumpAndSettle();
 
     verify(() => authBloc.add(const OAuthLoginRequested(handle: 'river.bsky.social'))).called(1);
@@ -173,7 +205,7 @@ void main() {
     await tester.pumpAndSettle();
 
     await tester.enterText(find.byType(TextFormField).first, 'river.bsky.social');
-    await tester.tap(find.text('Continue'));
+    await tester.tap(find.byKey(const ValueKey<String>('login-continue-button')));
     await tester.pumpAndSettle();
 
     verifyInOrder([
@@ -182,6 +214,57 @@ void main() {
     ]);
   });
 
+  testWidgets('handle field exposes persistent label and continue tooltip', (tester) async {
+    await tester.pumpWidget(buildSubject());
+    await tester.pumpAndSettle();
+
+    final field = tester.widget<TextField>(find.byType(TextField).first);
+    expect(field.decoration?.labelText, 'Handle or DID');
+    expect(find.byTooltip('Continue'), findsOneWidget);
+  });
+
+  testWidgets('login normalizes identifier before starting OAuth', (tester) async {
+    await tester.pumpWidget(buildSubject());
+    await tester.pumpAndSettle();
+
+    await tester.enterText(find.byType(TextFormField).first, ' @River.BSky.Social ');
+    await tester.tap(find.byKey(const ValueKey<String>('login-continue-button')));
+    await tester.pumpAndSettle();
+
+    verifyInOrder([
+      () => settingsCubit.setAppViewProvider('bluesky'),
+      () => authBloc.add(const OAuthLoginRequested(handle: 'river.bsky.social')),
+    ]);
+  });
+
+  testWidgets('invalid identifier shows centralized validation message and does not start OAuth', (tester) async {
+    await tester.pumpWidget(buildSubject());
+    await tester.pumpAndSettle();
+
+    await tester.enterText(find.byType(TextFormField).first, 'not-a-handle');
+    await tester.tap(find.byKey(const ValueKey<String>('login-continue-button')));
+    await tester.pumpAndSettle();
+
+    expect(find.text('Enter a full handle like username.bsky.social'), findsOneWidget);
+    verifyNever(() => settingsCubit.setAppViewProvider(any()));
+    verifyNever(() => authBloc.add(const OAuthLoginRequested(handle: 'not-a-handle')));
+  });
+
+  testWidgets('auto-starts OAuth once when reauth opens with an initial handle', (tester) async {
+    await tester.pumpWidget(buildSubject(initialHandle: 'alice.bsky.social', autoStartOAuth: true));
+    await tester.pumpAndSettle();
+
+    final field = tester.widget<TextFormField>(find.byType(TextFormField).first);
+    expect(field.controller?.text, 'alice.bsky.social');
+    verifyInOrder([
+      () => settingsCubit.setAppViewProvider('bluesky'),
+      () => authBloc.add(const OAuthLoginRequested(handle: 'alice.bsky.social')),
+    ]);
+
+    await tester.pump();
+    verifyNever(() => authBloc.add(const OAuthLoginRequested(handle: 'alice.bsky.social')));
+  });
+
   testWidgets('tints BlackSky logo in dark mode', (tester) async {
     await tester.pumpWidget(buildSubject(themeMode: ThemeMode.dark));
     await tester.pumpAndSettle();
@@ -196,6 +279,107 @@ void main() {
     final blueSkySvg = tester.widget<SvgPicture>(blueSkyLogo.first);
     expect(blueSkySvg.colorFilter, isNull);
   });
+
+  testWidgets('saved account row tap restores stored session', (tester) async {
+    final account = _makeAccount(did: 'did:plc:alice', handle: 'alice.bsky.social', displayName: 'Alice');
+    final state = AccountSwitcherState.ready(accounts: [account], activeDid: account.did);
+    const tokens = AuthTokens(accessToken: 'token', did: 'did:plc:alice', handle: 'alice.bsky.social');
+    when(() => accountSwitcherCubit.state).thenReturn(state);
+    whenListen(accountSwitcherCubit, const Stream<AccountSwitcherState>.empty(), initialState: state);
+    when(() => accountSwitcherCubit.switchAccount(account.did)).thenAnswer((_) async => tokens);
+
+    await tester.pumpWidget(buildSubject());
+    await tester.pumpAndSettle();
+
+    expect(find.text('Saved accounts'), findsOneWidget);
+    expect(find.text('Alice'), findsOneWidget);
+    expect(find.text('@alice.bsky.social'), findsOneWidget);
+
+    await tester.tap(find.byKey(const ValueKey<String>('saved-account-did:plc:alice')));
+    await tester.pumpAndSettle();
+
+    final field = tester.widget<TextFormField>(find.byType(TextFormField).first);
+    expect(field.controller?.text, 'alice.bsky.social');
+    verify(() => accountSwitcherCubit.switchAccount(account.did)).called(1);
+    verify(() => authBloc.add(const SessionRestored(tokens: tokens))).called(1);
+    verifyNever(() => authBloc.add(const OAuthLoginRequested(handle: 'alice.bsky.social')));
+  });
+
+  testWidgets('saved account row tap starts OAuth reauth when stored session cannot be restored', (tester) async {
+    final account = _makeAccount(did: 'did:plc:alice', handle: 'alice.bsky.social', displayName: 'Alice');
+    final state = AccountSwitcherState.ready(accounts: [account], activeDid: account.did);
+    when(() => accountSwitcherCubit.state).thenReturn(state);
+    whenListen(accountSwitcherCubit, const Stream<AccountSwitcherState>.empty(), initialState: state);
+    when(() => accountSwitcherCubit.switchAccount(account.did)).thenAnswer((_) async => null);
+
+    await tester.pumpWidget(buildSubject());
+    await tester.pumpAndSettle();
+
+    await tester.tap(find.byKey(const ValueKey<String>('saved-account-did:plc:alice')));
+    await tester.pumpAndSettle();
+
+    final field = tester.widget<TextFormField>(find.byType(TextFormField).first);
+    expect(field.controller?.text, 'alice.bsky.social');
+    verify(() => accountSwitcherCubit.switchAccount(account.did)).called(1);
+    verifyInOrder([
+      () => settingsCubit.setAppViewProvider('bluesky'),
+      () => authBloc.add(const OAuthLoginRequested(handle: 'alice.bsky.social')),
+    ]);
+    verifyNever(
+      () => authBloc.add(
+        const SessionRestored(
+          tokens: AuthTokens(accessToken: 'token', did: 'did:plc:alice', handle: 'alice.bsky.social'),
+        ),
+      ),
+    );
+  });
+
+  testWidgets('shows saved accounts loading state while account list is loading', (tester) async {
+    when(() => accountSwitcherCubit.state).thenReturn(const AccountSwitcherState.loading());
+    whenListen(
+      accountSwitcherCubit,
+      const Stream<AccountSwitcherState>.empty(),
+      initialState: const AccountSwitcherState.loading(),
+    );
+
+    await tester.pumpWidget(buildSubject());
+    await tester.pump();
+    await tester.pump(const Duration(milliseconds: 200));
+
+    expect(find.text('Saved accounts'), findsOneWidget);
+    expect(find.text('Loading saved accounts...'), findsOneWidget);
+    expect(find.byType(CircularProgressIndicator), findsWidgets);
+  });
+
+  testWidgets('remove saved account dispatches SessionCleared and hides section when list becomes empty', (
+    tester,
+  ) async {
+    final account = _makeAccount(did: 'did:plc:alice', handle: 'alice.bsky.social', displayName: 'Alice');
+    final initial = AccountSwitcherState.ready(accounts: [account], activeDid: account.did);
+    const empty = AccountSwitcherState.ready(accounts: []);
+    final states = StreamController<AccountSwitcherState>();
+    addTearDown(states.close);
+
+    when(() => accountSwitcherCubit.state).thenReturn(initial);
+    whenListen(accountSwitcherCubit, states.stream, initialState: initial);
+    when(() => accountSwitcherCubit.removeAccount(account.did)).thenAnswer((_) async {
+      states.add(empty);
+      return const AccountRemovalResult.requiresSignIn();
+    });
+
+    await tester.pumpWidget(buildSubject());
+    await tester.pumpAndSettle();
+
+    expect(find.text('Saved accounts'), findsOneWidget);
+    await tester.tap(find.byTooltip('Remove account').first);
+    await tester.pumpAndSettle();
+    await tester.tap(find.text('Remove'));
+    await tester.pumpAndSettle();
+
+    verify(() => accountSwitcherCubit.removeAccount(account.did)).called(1);
+    verify(() => authBloc.add(const SessionCleared())).called(1);
+    expect(find.text('Saved accounts'), findsNothing);
+  });
 }
 
 class _FakeTypeaheadRepository extends TypeaheadRepository {
@@ -208,3 +392,22 @@ class _FakeTypeaheadRepository extends TypeaheadRepository {
     return searchHandler(query: query, limit: limit);
   }
 }
+
+Account _makeAccount({required String did, required String handle, String? displayName}) {
+  return Account(
+    did: did,
+    handle: handle,
+    displayName: displayName,
+    service: null,
+    oauthService: null,
+    oauthClientId: null,
+    accessToken: 'token',
+    refreshToken: null,
+    dpopPublicKey: null,
+    dpopPrivateKey: null,
+    dpopNonce: null,
+    expiresAt: null,
+    createdAt: DateTime.utc(2026, 1, 1),
+    updatedAt: DateTime.utc(2026, 1, 1),
+  );
+}