diff --git a/apps/web/src/layouts/Main.tsx b/apps/web/src/layouts/Main.tsx
index d55bb0ad..7a59ce75 100644
--- a/apps/web/src/layouts/Main.tsx
+++ b/apps/web/src/layouts/Main.tsx
@@ -162,12 +162,12 @@ function Main(props: MainProps) {
     }
 
     window.location.href = prompt
-      ? `https://rocksky.pages.dev/loading?handle=${handle}&prompt=${prompt}`
+      ? `https://rocksky.pages.dev/loading?prompt=${prompt}`
       : `https://rocksky.pages.dev/loading?handle=${handle}`;
   };
 
   const onCreateAccount = async () => {
-    await onLogin("create_account");
+    await onLogin("create");
   };
 
   return (
diff --git a/apps/web/src/pages/loading/Loading.tsx b/apps/web/src/pages/loading/Loading.tsx
index c978fe55..fab6689d 100644
--- a/apps/web/src/pages/loading/Loading.tsx
+++ b/apps/web/src/pages/loading/Loading.tsx
@@ -4,13 +4,16 @@ import { useEffect } from "react";
 import { API_URL } from "../../consts";
 
 function Loading() {
-  const { handle } = useSearch({ strict: false });
+  const { handle, prompt } = useSearch({ strict: false });
 
   useEffect(() => {
+    if (prompt) {
+      window.location.href = `${API_URL}/login?prompt=${prompt}`;
+    }
     if (handle) {
       window.location.href = `${API_URL}/login?handle=${handle}`;
     }
-  }, [handle]);
+  }, [handle, prompt]);
 
   return (
     <div className="flex justify-center items-center h-screen bg-[#fff] fixed top-0 left-0 w-full">
diff --git a/apps/web/src/routes/loading.tsx b/apps/web/src/routes/loading.tsx
index 59912b6c..6e89a8ca 100644
--- a/apps/web/src/routes/loading.tsx
+++ b/apps/web/src/routes/loading.tsx
@@ -4,7 +4,8 @@ import z from "zod";
 import LoadingPage from "../pages/loading";
 
 const validateSearch = z.object({
-  handle: z.string(),
+  handle: z.string().optional(),
+  prompt: z.string().optional(),
 });
 
 export const Route = createFileRoute("/loading")({