diff --git a/apps/browser-extension/entrypoints/popup/App.tsx b/apps/browser-extension/entrypoints/popup/App.tsx
index 498a75a2c..ac646ff79 100644
--- a/apps/browser-extension/entrypoints/popup/App.tsx
+++ b/apps/browser-extension/entrypoints/popup/App.tsx
@@ -175,10 +175,21 @@ function App() {
 		setShowProjectSelector(true)
 	}
 
+	// Reconcile stored default against live list: reset if deleted, refresh if renamed.
 	useEffect(() => {
-		if (!defaultProject && projects.length > 0) {
-			const firstProject = projects[0]
-			setDefaultProjectMutation.mutate(firstProject)
+		if (projects.length === 0) return
+		if (!defaultProject) {
+			setDefaultProjectMutation.mutate(projects[0])
+			return
+		}
+		const live = projects.find((p) => p.id === defaultProject.id)
+		if (!live) {
+			setDefaultProjectMutation.mutate(projects[0])
+		} else if (
+			live.name !== defaultProject.name ||
+			live.containerTag !== defaultProject.containerTag
+		) {
+			setDefaultProjectMutation.mutate(live)
 		}
 	}, [defaultProject, projects, setDefaultProjectMutation])
 
diff --git a/apps/browser-extension/wxt.config.ts b/apps/browser-extension/wxt.config.ts
index c810e73f5..b7b6147f3 100644
--- a/apps/browser-extension/wxt.config.ts
+++ b/apps/browser-extension/wxt.config.ts
@@ -29,7 +29,7 @@ export default defineConfig({
 	manifest: {
 		name: "supermemory",
 		homepage_url: "https://supermemory.ai",
-		version: "6.1.3",
+		version: "6.1.4",
 		permissions: ["storage", "activeTab", "webRequest", "tabs"],
 		host_permissions: [
 			"*://x.com/*",
diff --git a/apps/web/app/(auth)/login/page.tsx b/apps/web/app/(auth)/login/page.tsx
index 49fc56fc1..dbdacdfca 100644
--- a/apps/web/app/(auth)/login/page.tsx
+++ b/apps/web/app/(auth)/login/page.tsx
@@ -140,14 +140,11 @@ export default function LoginPage() {
 			)
 			return
 		}
-		router.replace("/")
-	}, [
-		sessionPending,
-		sessionData?.session,
-		oauthQueryForResume,
-		params,
-		router,
-	])
+		// Carry the flag so the dashboard posts the session token to the extension (else: sign-in loop).
+		const dest = new URL("/", window.location.origin)
+		dest.searchParams.set("extension-auth-success", "true")
+		window.location.assign(dest.toString())
+	}, [sessionPending, sessionData?.session, oauthQueryForResume, params])
 
 	// Get redirect URL from query params
 	const redirectUrl = params.get("redirect")