diff --git a/apps/hackathon/src/app/auth/callback/page.tsx b/apps/hackathon/src/app/auth/callback/page.tsx
index 7122242..6100e37 100644
--- a/apps/hackathon/src/app/auth/callback/page.tsx
+++ b/apps/hackathon/src/app/auth/callback/page.tsx
@@ -25,20 +25,32 @@ const CallbackPage: FC = (): ReactElement => {
         const type = hashParams.get('type') || urlParams.get('type');
         const accessToken = hashParams.get('access_token') || urlParams.get('access_token');
 
-        // Handle email confirmation callback from Supabase
-        if (type === 'signup' || type === 'email_confirmation' || type === 'recovery') {
-          // Don't auto sign in - redirect to login with success message
+        // Debug: log what we received
+        console.log('[Callback] Params:', { type, accessToken: !!accessToken, hash: globalThis.location.hash, search: globalThis.location.search });
+
+        // Handle Supabase email callbacks (has access_token in hash or query)
+        // This includes: signup confirmation, email confirmation, password recovery
+        if (accessToken) {
           setIsProcessing(false);
 
-          if (type === 'recovery') {
-            // Password reset - redirect to reset password page
+          // Password recovery - type is 'recovery' or we have access_token from reset email
+          if (type === 'recovery' || type === 'magiclink') {
             toast.success('Email verified! Please set your new password.');
-            navigate('/auth/reset-password' + (accessToken ? `?access_token=${accessToken}` : ''));
-          } else {
-            // Email confirmation for signup
+            navigate('/auth/reset-password?access_token=' + accessToken);
+            return;
+          }
+
+          // Signup/Email confirmation
+          if (type === 'signup' || type === 'email_confirmation') {
             toast.success('Email verified successfully! Please log in to continue.');
             navigate('/auth/login');
+            return;
           }
+
+          // If we have access_token but unknown type, assume it's password recovery
+          // (Supabase sometimes sends without explicit type)
+          toast.success('Email verified! Please set your new password.');
+          navigate('/auth/reset-password?access_token=' + accessToken);
           return;
         }
 
@@ -78,6 +90,12 @@ const CallbackPage: FC = (): ReactElement => {
   }, []);
 
   if (error) {
+    // Check if error is related to private email
+    const isPrivateEmailError =
+      error.toLowerCase().includes('failed to create user') ||
+      error.toLowerCase().includes('email') ||
+      error.toLowerCase().includes('user record');
+
     return (
       <div className="flex justify-center items-center min-h-screen bg-gray-50 dark:bg-gray-950 px-4">
         <div className="bg-white dark:bg-gray-900 w-full max-w-2xl p-8 rounded-2xl shadow-lg border border-red-200 dark:border-red-800">
@@ -89,6 +107,47 @@ const CallbackPage: FC = (): ReactElement => {
             <p className="text-red-600 dark:text-red-400 mb-4 whitespace-pre-line">{error}</p>
           </div>
 
+          {isPrivateEmailError && (
+            <div className="bg-amber-50 dark:bg-amber-900/20 border border-amber-200 dark:border-amber-800 rounded-lg p-4 mb-6">
+              <h3 className="font-semibold text-amber-800 dark:text-amber-300 mb-2">
+                Is your GitHub email set to private?
+              </h3>
+              <p className="text-amber-700 dark:text-amber-400 text-sm mb-3">
+                GitHub login requires a public email address. Please follow these steps:
+              </p>
+              <ol className="text-amber-700 dark:text-amber-400 text-sm list-decimal list-inside space-y-1 mb-3">
+                <li>
+                  Go to{' '}
+                  <a
+                    href="https://github.com/settings/emails"
+                    target="_blank"
+                    rel="noopener noreferrer"
+                    className="underline hover:text-amber-900 dark:hover:text-amber-200"
+                  >
+                    GitHub Email Settings
+                  </a>
+                </li>
+                <li>Uncheck "Keep my email addresses private"</li>
+                <li>
+                  Or go to{' '}
+                  <a
+                    href="https://github.com/settings/profile"
+                    target="_blank"
+                    rel="noopener noreferrer"
+                    className="underline hover:text-amber-900 dark:hover:text-amber-200"
+                  >
+                    Profile Settings
+                  </a>{' '}
+                  and set a public email
+                </li>
+                <li>Try signing in with GitHub again</li>
+              </ol>
+              <p className="text-amber-600 dark:text-amber-500 text-xs">
+                Alternatively, you can sign up using email and password instead.
+              </p>
+            </div>
+          )}
+
           <p className="text-gray-600 dark:text-gray-400 text-sm mt-6 text-center">
             Redirecting to login page in 3 seconds...
           </p>
diff --git a/libs/service/src/hooks/auth/index.ts b/libs/service/src/hooks/auth/index.ts
index ff8e87c..2d41e37 100644
--- a/libs/service/src/hooks/auth/index.ts
+++ b/libs/service/src/hooks/auth/index.ts
@@ -272,12 +272,9 @@ export const useEmailAuth = () => {
 
   const signUpWithEmail = async (email: string, password: string, fullname: string) => {
     const result = await signupMutation.mutateAsync({ email, password, fullname });
+    // Signup only returns a message (user needs to verify email first)
     return {
-      user: result.user,
-      session: {
-        access_token: result.token.access_token,
-        refresh_token: result.token.refresh_token,
-      },
+      message: result.message,
     };
   };