diff --git a/surfsense_web/.gitignore b/surfsense_web/.gitignore
index 6ae7fe0c4..12ad12c84 100644
--- a/surfsense_web/.gitignore
+++ b/surfsense_web/.gitignore
@@ -50,3 +50,5 @@ next-env.d.ts
 
 .pnpm-store/
 
+# Connector status config (use .example.json as template)
+components/assistant-ui/connector-popup/config/connector-status-config.json
diff --git a/surfsense_web/atoms/user/user-query.atoms.ts b/surfsense_web/atoms/user/user-query.atoms.ts
index ea3e7ec49..cd9ec6c87 100644
--- a/surfsense_web/atoms/user/user-query.atoms.ts
+++ b/surfsense_web/atoms/user/user-query.atoms.ts
@@ -1,11 +1,14 @@
 import { atomWithQuery } from "jotai-tanstack-query";
 import { userApiService } from "@/lib/apis/user-api.service";
+import { getBearerToken } from "@/lib/auth-utils";
 import { cacheKeys } from "@/lib/query-client/cache-keys";
 
 export const currentUserAtom = atomWithQuery(() => {
 	return {
 		queryKey: cacheKeys.user.current(),
 		staleTime: 5 * 60 * 1000, // 5 minutes
+		// Only fetch user data when a bearer token is present
+		enabled: !!getBearerToken(),
 		queryFn: async () => {
 			return userApiService.getMe();
 		},