diff --git a/frontend/app/[locale]/dashboard/page.tsx b/frontend/app/[locale]/dashboard/page.tsx
index 426a4355..f40c3e60 100644
--- a/frontend/app/[locale]/dashboard/page.tsx
+++ b/frontend/app/[locale]/dashboard/page.tsx
@@ -7,6 +7,7 @@ import { getUserQuizStats } from '@/db/queries/quiz';
 import { ProfileCard } from '@/components/dashboard/ProfileCard';
 import { StatsCard } from '@/components/dashboard/StatsCard';
 import { QuizSavedBanner } from '@/components/dashboard/QuizSavedBanner';
+import { PostAuthQuizSync } from "@/components/auth/PostAuthQuizSync";
 
 export const metadata = {
   title: 'Dashboard | DevLovers',
@@ -28,9 +29,9 @@ export default async function DashboardPage({ params }: { params: Promise<{ loca
   const averageScore =
     totalAttempts > 0
       ? Math.round(
-          attempts.reduce((acc, curr) => acc + Number(curr.percentage), 0) /
-            totalAttempts
-        )
+        attempts.reduce((acc, curr) => acc + Number(curr.percentage), 0) /
+        totalAttempts
+      )
       : 0;
 
   const lastActiveDate =
@@ -57,6 +58,7 @@ export default async function DashboardPage({ params }: { params: Promise<{ loca
 
   return (
     <main className="relative min-h-[calc(100vh-80px)] overflow-hidden">
+      <PostAuthQuizSync />
       <div
         className="absolute inset-0 pointer-events-none -z-10"
         aria-hidden="true"
diff --git a/frontend/app/[locale]/login/page.tsx b/frontend/app/[locale]/login/page.tsx
index 408f5801..7821c4d7 100644
--- a/frontend/app/[locale]/login/page.tsx
+++ b/frontend/app/[locale]/login/page.tsx
@@ -4,10 +4,6 @@ import { useLocale } from "next-intl";
 import { Link } from "@/i18n/routing";
 import { useState } from "react";
 import { useSearchParams } from "next/navigation";
-import {
-  getPendingQuizResult,
-  clearPendingQuizResult,
-} from "@/lib/quiz/guest-quiz";
 import { Button } from "@/components/ui/button";
 import { OAuthButtons } from "@/components/auth/OAuthButtons";
 
@@ -74,50 +70,6 @@ export default function LoginPage() {
         return;
       }
 
-      const pendingResult = getPendingQuizResult();
-
-      if (pendingResult && data?.userId) {
-        try {
-          const quizRes = await fetch("/api/quiz/guest-result", {
-            method: "POST",
-            headers: { "Content-Type": "application/json" },
-            body: JSON.stringify({
-              userId: data.userId,
-              quizId: pendingResult.quizId,
-              answers: pendingResult.answers,
-              violations: pendingResult.violations,
-              timeSpentSeconds:
-                pendingResult.timeSpentSeconds,
-            }),
-          });
-
-          if (!quizRes.ok) {
-            throw new Error(
-              `Failed to save quiz result: ${quizRes.status}`
-            );
-          }
-
-          const result = await quizRes.json();
-
-          if (result.success) {
-            sessionStorage.setItem(
-              "quiz_just_saved",
-              JSON.stringify({
-                score: result.score,
-                total: result.totalQuestions,
-                percentage: result.percentage,
-                pointsAwarded: result.pointsAwarded,
-                quizSlug: pendingResult.quizSlug,
-              })
-            );
-          }
-        } catch (err) {
-          console.error("Failed to save quiz result:", err);
-        } finally {
-          clearPendingQuizResult();
-        }
-      }
-
       const redirectTarget =
         returnTo && isSafeRedirectUrl(returnTo)
           ? returnTo
diff --git a/frontend/app/api/auth/google/callback/route.ts b/frontend/app/api/auth/google/callback/route.ts
index 25ea646f..2430415a 100644
--- a/frontend/app/api/auth/google/callback/route.ts
+++ b/frontend/app/api/auth/google/callback/route.ts
@@ -152,5 +152,5 @@ export async function GET(req: NextRequest) {
 
   await setAuthCookie(token);
 
-  return NextResponse.redirect(new URL("/", req.url));
+  return NextResponse.redirect(new URL("/dashboard", req.url));
 }   
diff --git a/frontend/app/api/quiz/guest-result/route.ts b/frontend/app/api/quiz/guest-result/route.ts
index 9fa0f73c..eb63df90 100644
--- a/frontend/app/api/quiz/guest-result/route.ts
+++ b/frontend/app/api/quiz/guest-result/route.ts
@@ -1,7 +1,12 @@
 import { NextResponse } from "next/server";
-import { getCurrentUser } from '@/lib/auth';
+import { getCurrentUser } from "@/lib/auth";
 import { db } from "@/db";
-import { quizAttempts, quizAttemptAnswers, quizQuestions, quizAnswers } from "@/db/schema/quiz";
+import {
+  quizAttempts,
+  quizAttemptAnswers,
+  quizQuestions,
+  quizAnswers,
+} from "@/db/schema/quiz";
 import { awardQuizPoints, calculateQuizPoints } from "@/db/queries/points";
 import { eq, inArray } from "drizzle-orm";
 
@@ -17,9 +22,9 @@ export async function POST(req: Request) {
     );
   }
 
-  const { userId, quizId, answers, violations, timeSpentSeconds } = body;
+  const { quizId, answers, violations, timeSpentSeconds } = body;
 
-  if (!userId || !quizId || !Array.isArray(answers) || answers.length === 0) {
+  if (!quizId || !Array.isArray(answers) || answers.length === 0) {
     return NextResponse.json(
       { success: false, error: "Invalid input" },
       { status: 400 }
@@ -27,13 +32,15 @@ export async function POST(req: Request) {
   }
 
   const session = await getCurrentUser();
-  if (!session || session.id !== userId) {
+  if (!session) {
     return NextResponse.json(
       { success: false, error: "Unauthorized" },
       { status: 401 }
     );
   }
 
+  const userId = session.id;
+
   const questionRows = await db
     .select({ id: quizQuestions.id })
     .from(quizQuestions)
@@ -114,14 +121,13 @@ export async function POST(req: Request) {
       );
     }
 
-    const isCorrect = record.isCorrect;
-    if (isCorrect) correctAnswersCount++;
+    if (record.isCorrect) correctAnswersCount++;
 
     attemptAnswers.push({
       attemptId: "",
       quizQuestionId: answer.questionId,
       selectedAnswerId: answer.selectedAnswerId,
-      isCorrect,
+      isCorrect: record.isCorrect,
       answeredAt: now,
     });
   }
@@ -132,10 +138,12 @@ export async function POST(req: Request) {
   const integrityScore = Math.max(0, 100 - violationsArray.length * 10);
   const safeTimeSpentSeconds = Math.max(0, Number(timeSpentSeconds) || 0);
   const startedAt = new Date(now.getTime() - safeTimeSpentSeconds * 1000);
+
   const pointsEarned = calculateQuizPoints({
     score: correctAnswersCount,
     integrityScore,
   });
+
   try {
     const [attempt] = await db
       .insert(quizAttempts)
@@ -185,4 +193,4 @@ export async function POST(req: Request) {
       { status: 500 }
     );
   }
-}
+}
\ No newline at end of file
diff --git a/frontend/components/auth/PostAuthQuizSync.tsx b/frontend/components/auth/PostAuthQuizSync.tsx
new file mode 100644
index 00000000..ee4be623
--- /dev/null
+++ b/frontend/components/auth/PostAuthQuizSync.tsx
@@ -0,0 +1,63 @@
+"use client";
+
+import { useEffect } from "react";
+import { useRouter } from "next/navigation";
+import {
+    getPendingQuizResult,
+    clearPendingQuizResult,
+} from "@/lib/quiz/guest-quiz";
+
+
+export function PostAuthQuizSync() {
+    const router = useRouter();
+
+    useEffect(() => {
+
+        queueMicrotask(() => {
+            const pendingResult = getPendingQuizResult();
+            if (!pendingResult) return;
+
+            (async () => {
+                try {
+                    const res = await fetch("/api/quiz/guest-result", {
+                        method: "POST",
+                        headers: { "Content-Type": "application/json" },
+                        body: JSON.stringify({
+                            quizId: pendingResult.quizId,
+                            answers: pendingResult.answers,
+                            violations: pendingResult.violations,
+                            timeSpentSeconds: pendingResult.timeSpentSeconds,
+                        }),
+                    });
+
+                    if (!res.ok) {
+                        throw new Error(`Failed to save quiz result (${res.status})`);
+                    }
+
+                    const result = await res.json();
+
+                    if (!result?.success) {
+                        throw new Error("Quiz save did not succeed");
+                    }
+
+                    sessionStorage.setItem(
+                        "quiz_just_saved",
+                        JSON.stringify({
+                            score: result.score,
+                            total: result.totalQuestions,
+                            percentage: result.percentage,
+                            pointsAwarded: result.pointsAwarded,
+                            quizSlug: pendingResult.quizSlug,
+                        })
+                    );
+                    clearPendingQuizResult();
+                    router.refresh();
+                } catch (error) {
+                    console.error("Failed to sync guest quiz result:", error);
+                }
+            })();
+        });
+    }, [router]);
+
+    return null;
+}
\ No newline at end of file
diff --git a/frontend/project-structure.txt b/frontend/project-structure.txt
index db72f9ec..df3e5f36 100644
--- a/frontend/project-structure.txt
+++ b/frontend/project-structure.txt
@@ -1,89 +1,21 @@
+📄 .DS_Store
 📄 .env
 📄 .env.example
 📄 .gitignore
 📄 .prettierrc
+📄 README.md
 📁 actions
   📄 quiz.ts
 📁 app
-  📁 api
-    📁 auth
-      📁 github
-        📁 callback
-          📄 route.ts
-        📄 route.ts
-      📁 google
-        📁 callback
-          📄 route.ts
-        📄 route.ts
-      📁 login
-        📄 route.ts
-      📁 logout
-        📄 route.ts
-      📁 me
-        📄 route.ts
-      📁 password-reset
-        📁 confirm
-          📄 route.ts
-        📄 route.ts
-      📁 resend-verification
-        📄 route.ts
-      📁 signup
-        📄 route.ts
-      📁 verify-email
-        📄 route.ts
-    📁 questions
-      📁 [category]
-        📄 route.ts
-    📁 quiz
-      📁 guest-result
-        📄 route.ts
-      📁 verify-answer
-        📄 route.ts
-      📁 [slug]
-        📄 route.ts
-    📁 shop
-      📁 admin
-        📁 orders
-          📁 reconcile-stale
-            📄 route.ts
-          📄 route.ts
-          📁 [id]
-            📁 refund
-              📄 route.ts
-            📄 route.ts
-        📁 products
-          📄 route.ts
-          📁 [id]
-            📄 route.ts
-            📁 status
-              📄 route.ts
-      📁 cart
-        📁 rehydrate
-          📄 route.ts
-      📁 catalog
-        📄 route.ts
-      📁 checkout
-        📄 route.ts
-      📁 internal
-        📁 orders
-          📁 restock-stale
-            📄 route.ts
-      📁 orders
-        📁 [id]
-          📄 route.ts
-      📁 webhooks
-        📁 stripe
-          📄 route.ts
-  📄 globals.css
-  📄 layout.tsx
+  📄 .DS_Store
   📁 [locale]
     📁 about
       📄 page.tsx
     📁 blog
-      📄 page.tsx
       📁 [slug]
-        📄 page.tsx
         📄 PostDetails.tsx
+        📄 page.tsx
+      📄 page.tsx
     📁 contacts
       📄 page.tsx
     📁 dashboard
@@ -111,20 +43,20 @@
     📁 shop
       📁 admin
         📁 orders
-          📄 page.tsx
           📁 [id]
-            📄 page.tsx
             📄 RefundButton.tsx
-        📄 page.tsx
-        📁 products
-          📁 new
             📄 page.tsx
           📄 page.tsx
+        📄 page.tsx
+        📁 products
           📁 [id]
             📁 edit
               📄 page.tsx
           📁 _components
             📄 product-form.tsx
+          📁 new
+            📄 page.tsx
+          📄 page.tsx
       📁 cart
         📄 page.tsx
       📁 checkout
@@ -144,13 +76,86 @@
           📄 page.tsx
       📄 page.tsx
       📁 products
-        📄 page.tsx
         📁 [slug]
           📄 page.tsx
     📁 signup
       📄 page.tsx
     📁 terms-of-service
       📄 page.tsx
+  📁 api
+    📄 .DS_Store
+    📁 auth
+      📄 .DS_Store
+      📁 github
+        📁 callback
+          📄 route.ts
+        📄 route.ts
+      📁 google
+        📁 callback
+          📄 route.ts
+        📄 route.ts
+      📁 login
+        📄 route.ts
+      📁 logout
+        📄 route.ts
+      📁 me
+        📄 route.ts
+      📁 password-reset
+        📁 confirm
+          📄 route.ts
+        📄 route.ts
+      📁 resend-verification
+        📄 .DS_Store
+        📄 route.ts
+      📁 signup
+        📄 route.ts
+      📁 verify-email
+        📄 route.ts
+    📁 questions
+      📁 [category]
+        📄 route.ts
+    📁 quiz
+      📁 [slug]
+        📄 route.ts
+      📁 guest-result
+        📄 route.ts
+      📁 verify-answer
+        📄 route.ts
+    📁 shop
+      📁 admin
+        📁 orders
+          📁 [id]
+            📁 refund
+              📄 route.ts
+            📄 route.ts
+          📁 reconcile-stale
+            📄 route.ts
+          📄 route.ts
+        📁 products
+          📁 [id]
+            📄 route.ts
+            📁 status
+              📄 route.ts
+          📄 route.ts
+      📁 cart
+        📁 rehydrate
+          📄 route.ts
+      📁 catalog
+        📄 route.ts
+      📁 checkout
+        📄 route.ts
+      📁 internal
+        📁 orders
+          📁 restock-stale
+            📄 route.ts
+      📁 orders
+        📁 [id]
+          📄 route.ts
+      📁 webhooks
+        📁 stripe
+          📄 route.ts
+  📄 globals.css
+  📄 layout.tsx
 📄 checkout.json
 📄 client.ts
 📁 components
@@ -161,12 +166,12 @@
     📄 PricingSection.tsx
     📄 StatsSection.tsx
   📁 auth
+    📄 OAuthButtons.tsx
+    📄 ProviderButton.tsx
     📁 icons
       📄 GitHubIcon.tsx
       📄 GoogleIcon.tsx
     📄 logoutButton.tsx
-    📄 OAuthButtons.tsx
-    📄 ProviderButton.tsx
   📁 blog
     📄 AuthorModal.tsx
     📄 BlogCard.tsx
@@ -252,6 +257,7 @@
   📄 index.ts
   📁 legacy-migrations
     📁 drizzle_legacy
+      📄 .DS_Store
       📄 0000_rich_magus.sql
       📄 0001_black_random.sql
       📄 0002_yielding_purple_man.sql
@@ -336,9 +342,6 @@
   📄 seed-quiz-verify.ts
   📄 seed-quiz-vue.ts
   📄 seed-users.ts
-📁 docs
-  📁 payments
-    📄 fondy.md
 📁 drizzle
   📄 0000_dry_young_avengers.sql
   📄 0001_add_payment_attempts.sql
@@ -409,6 +412,7 @@
     📄 errors.ts
     📄 inventory.ts
     📁 orders
+      📄 _shared.ts
       📄 checkout.ts
       📄 payment-attempts.ts
       📄 payment-intent.ts
@@ -419,7 +423,6 @@
       📄 restock.ts
       📄 summary.ts
       📄 sweeps.ts
-      📄 _shared.ts
     📄 orders.ts
     📁 products
       📁 admin
@@ -446,6 +449,8 @@
     📄 request-locale.ts
     📄 slug.ts
   📁 tests
+    📁 __mocks__
+      📄 server-only.ts
     📄 admin-api-killswitch.test.ts
     📄 admin-csrf-contract.test.ts
     📄 admin-product-patch-price-config-error-contract.test.ts
@@ -482,8 +487,6 @@
     📄 stripe-webhook-paid-status-repair.test.ts
     📄 stripe-webhook-psp-fields.test.ts
     📄 stripe-webhook-refund-full.test.ts
-    📁 __mocks__
-      📄 server-only.ts
   📁 types
     📄 shop.ts
   📄 utils.ts
@@ -499,9 +502,9 @@
 📄 package-lock.json
 📄 package.json
 📁 parse
+  📄 README.md
   📄 parse.ts
   📄 questions.json
-  📄 README.md
   📄 start.json
   📁 typescript
     📁 advanced
@@ -524,10 +527,8 @@
   📄 favicon-light.svg
   📄 lifestyle.jpg
   📄 placeholder.svg
-📄 README.md
 📄 save-structure.cjs
 📁 scripts
   📄 shop-janitor-restock-stale.mjs
 📄 tsconfig.json
-📄 tsconfig.tsbuildinfo
 📄 vitest.config.ts
\ No newline at end of file