diff --git a/src/client/components/AuthPromptModal.tsx b/src/client/components/AuthPromptModal.tsx
new file mode 100644
index 0000000..d2eca84
--- /dev/null
+++ b/src/client/components/AuthPromptModal.tsx
@@ -0,0 +1,45 @@
+import { Link } from "@tanstack/react-router";
+import { useUIStore } from "../stores/uiStore";
+
+export function AuthPromptModal() {
+	const showAuthPrompt = useUIStore((s) => s.showAuthPrompt);
+	const closeAuthPrompt = useUIStore((s) => s.closeAuthPrompt);
+
+	if (!showAuthPrompt) return null;
+
+	return (
+		<div className="fixed inset-0 z-50 flex items-center justify-center">
+			<div
+				className="absolute inset-0 bg-black/30"
+				onClick={closeAuthPrompt}
+				onKeyDown={(e) => {
+					if (e.key === "Escape") closeAuthPrompt();
+				}}
+			/>
+			<div className="relative bg-white rounded-xl shadow-lg p-6 max-w-sm mx-4 w-full">
+				<h3 className="text-lg font-semibold text-gray-900 mb-2">
+					Join GearBox
+				</h3>
+				<p className="text-sm text-gray-600 mb-6">
+					To manage your own collection, sign in or sign up.
+				</p>
+				<div className="flex flex-col gap-3">
+					<Link
+						to="/login"
+						className="w-full text-center px-4 py-2.5 text-sm font-medium text-white bg-gray-700 hover:bg-gray-800 rounded-lg transition-colors"
+						onClick={closeAuthPrompt}
+					>
+						Sign in
+					</Link>
+					<Link
+						to="/login"
+						className="w-full text-center px-4 py-2.5 text-sm font-medium text-gray-700 bg-gray-100 hover:bg-gray-200 rounded-lg transition-colors"
+						onClick={closeAuthPrompt}
+					>
+						Create account
+					</Link>
+				</div>
+			</div>
+		</div>
+	);
+}
diff --git a/src/client/hooks/useSettings.ts b/src/client/hooks/useSettings.ts
index b26f905..474029e 100644
--- a/src/client/hooks/useSettings.ts
+++ b/src/client/hooks/useSettings.ts
@@ -32,6 +32,20 @@ export function useUpdateSetting() {
 	});
 }
 
-export function useOnboardingComplete() {
-	return useSetting("onboardingComplete");
+export function useOnboardingComplete(enabled = true) {
+	return useQuery({
+		queryKey: ["settings", "onboardingComplete"],
+		queryFn: async () => {
+			try {
+				const result = await apiGet<Setting>(
+					`/api/settings/onboardingComplete`,
+				);
+				return result.value;
+			} catch (err: any) {
+				if (err?.status === 404) return null;
+				throw err;
+			}
+		},
+		enabled,
+	});
 }
diff --git a/src/client/hooks/useSetups.ts b/src/client/hooks/useSetups.ts
index 8e0b9da..33591e8 100644
--- a/src/client/hooks/useSetups.ts
+++ b/src/client/hooks/useSetups.ts
@@ -64,6 +64,16 @@ export function useSetup(setupId: number | null) {
 	});
 }
 
+export function usePublicSetup(setupId: number | null) {
+	return useQuery({
+		queryKey: ["setups", setupId, "public"],
+		queryFn: () => apiGet<SetupWithItems>(`/api/setups/${setupId}/public`),
+		enabled: setupId != null,
+		retry: (count, error) =>
+			error instanceof ApiError && error.status === 404 ? false : count < 3,
+	});
+}
+
 export function useCreateSetup() {
 	const queryClient = useQueryClient();
 	return useMutation({
diff --git a/src/client/stores/uiStore.ts b/src/client/stores/uiStore.ts
index b325622..147922a 100644
--- a/src/client/stores/uiStore.ts
+++ b/src/client/stores/uiStore.ts
@@ -79,6 +79,11 @@ interface UIState {
 	// Session thread tracking
 	catalogSessionThreadId: number | null;
 	setCatalogSessionThreadId: (id: number | null) => void;
+
+	// Auth prompt modal
+	showAuthPrompt: boolean;
+	openAuthPrompt: () => void;
+	closeAuthPrompt: () => void;
 }
 
 export const useUIStore = create<UIState>((set) => ({
@@ -184,4 +189,9 @@ export const useUIStore = create<UIState>((set) => ({
 	// Session thread tracking
 	catalogSessionThreadId: null,
 	setCatalogSessionThreadId: (id) => set({ catalogSessionThreadId: id }),
+
+	// Auth prompt modal
+	showAuthPrompt: false,
+	openAuthPrompt: () => set({ showAuthPrompt: true }),
+	closeAuthPrompt: () => set({ showAuthPrompt: false }),
 }));