diff --git a/app/Http/Controllers/Admin/AuthController.php b/app/Http/Controllers/Admin/AuthController.php
deleted file mode 100644
index ce3230ac..00000000
--- a/app/Http/Controllers/Admin/AuthController.php
+++ /dev/null
@@ -1,105 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Admin;
-
-use App\Http\Controllers\Controller;
-use App\Mail\WelcomeUserMail;
-use App\Models\User;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\Mail;
-use Inertia\Inertia;
-use Laravel\Socialite\Facades\Socialite;
-
-class AuthController extends Controller
-{
-    //
-    public function index()
-    {
-        if (Auth::check()) {
-            return redirect()->route('admin.index');
-        }
-
-        return Inertia::render('auth/Login');
-    }
-
-    public function redirectToGoogle(Request $request)
-    {
-        if (Auth::check()) {
-            return redirect()->route('admin.index');
-        }
-
-        if ($request->filled('redirect')) {
-            $redirectUrl = $request->query('redirect');
-
-            if (str_starts_with($redirectUrl, '/') && ! str_starts_with($redirectUrl, '//')) {
-                session(['url.intended' => url($redirectUrl)]);
-            } else {
-                $host = parse_url($redirectUrl, PHP_URL_HOST);
-                $appHost = parse_url(config('app.url'), PHP_URL_HOST);
-
-                if ($host && $appHost && ($host === $appHost || str_ends_with($host, '.'.$appHost) || $host === 'localhost')) {
-                    session(['url.intended' => $redirectUrl]);
-                }
-            }
-        }
-
-        return Socialite::driver('google')->redirect();
-    }
-
-    public function handleGoogleCallback(Request $request)
-    {
-        try {
-            $googleUser = Socialite::driver('google')->user();
-        } catch (\Throwable $e) {
-            return redirect()->route('login')->with('error', 'Failed to authenticate with Google. Please try again.');
-        }
-
-        $user = User::where('google_id', $googleUser->getId())
-            ->orWhere('email', $googleUser->getEmail())
-            ->first();
-
-        $isNewUser = false;
-
-        if ($user) {
-            $user->update([
-                'google_id' => $googleUser->getId(),
-                'email_verified_at' => $user->email_verified_at ?? now(),
-            ]);
-        } else {
-            $user = User::create([
-                'name' => $googleUser->getName() ?? $googleUser->getNickname() ?? 'Google User',
-                'email' => $googleUser->getEmail(),
-                'google_id' => $googleUser->getId(),
-                'email_verified_at' => now(),
-            ]);
-            $isNewUser = true;
-
-            Mail::to($user->email)->queue(new WelcomeUserMail($user));
-        }
-
-        Auth::login($user, remember: true);
-        $request->session()->regenerate();
-
-        $defaultUrl = $user->username
-            ? route('user.profile', $user->username)
-            : route('profile.edit');
-
-        $redirect = redirect()->intended($defaultUrl);
-
-        if ($isNewUser) {
-            $redirect->with('success', 'Account not found. New account created.');
-        }
-
-        return $redirect;
-    }
-
-    public function logout(Request $request)
-    {
-        Auth::logout();
-        $request->session()->invalidate();
-        $request->session()->regenerateToken();
-
-        return redirect()->route('index');
-    }
-}
diff --git a/app/Http/Controllers/AuthController.php b/app/Http/Controllers/AuthController.php
new file mode 100644
index 00000000..9b42ce1c
--- /dev/null
+++ b/app/Http/Controllers/AuthController.php
@@ -0,0 +1,172 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Http\Controllers\Controller;
+use App\Mail\WelcomeUserMail;
+use App\Models\User;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Mail;
+use Illuminate\Support\Str;
+use Inertia\Inertia;
+use Laravel\Socialite\Facades\Socialite;
+
+class AuthController extends Controller
+{
+    //
+    public function index()
+    {
+        if (Auth::check()) {
+            return redirect()->route('admin.index');
+        }
+
+        return Inertia::render('auth/Login');
+    }
+
+    public function redirectToGoogle(Request $request)
+    {
+        if (Auth::check()) {
+            return redirect()->route('admin.index');
+        }
+
+        if ($request->filled('redirect')) {
+            $redirectUrl = $request->query('redirect');
+
+            if (str_starts_with($redirectUrl, '/') && ! str_starts_with($redirectUrl, '//')) {
+                session(['url.intended' => url($redirectUrl)]);
+            } else {
+                $host = parse_url($redirectUrl, PHP_URL_HOST);
+                $appHost = parse_url(config('app.url'), PHP_URL_HOST);
+
+                if ($host && $appHost && ($host === $appHost || str_ends_with($host, '.'.$appHost) || $host === 'localhost')) {
+                    session(['url.intended' => $redirectUrl]);
+                }
+            }
+        }
+
+        return Socialite::driver('google')->redirect();
+    }
+
+    public function handleGoogleCallback(Request $request)
+    {
+        try {
+            $googleUser = Socialite::driver('google')->user();
+        } catch (\Throwable $e) {
+            return redirect()->route('login')->with('error', 'Failed to authenticate with Google. Please try again.');
+        }
+
+        $user = User::where('google_id', $googleUser->getId())
+            ->orWhere('email', $googleUser->getEmail())
+            ->first();
+
+        if ($user) {
+            $user->update([
+                'google_id' => $googleUser->getId(),
+                'email_verified_at' => $user->email_verified_at ?? now(),
+            ]);
+
+            Auth::login($user, remember: true);
+            $request->session()->regenerate();
+
+            $defaultUrl = $user->username
+                ? route('user.profile', $user->username)
+                : route('profile.edit');
+
+            return redirect()->intended($defaultUrl);
+        }
+
+        $request->session()->put('onboarding_user', [
+            'google_id' => $googleUser->getId(),
+            'email' => $googleUser->getEmail(),
+            'name' => $googleUser->getName() ?? $googleUser->getNickname() ?? '',
+            'avatar' => $googleUser->getAvatar() ?? null,
+        ]);
+
+        return redirect()->route('onboarding');
+    }
+
+    public function showOnboarding(Request $request)
+    {
+        if (Auth::check()) {
+            return redirect()->route('index');
+        }
+
+        if (! $request->session()->has('onboarding_user')) {
+            return redirect()->route('login')->with('error', 'Please continue with Google to create an account.');
+        }
+
+        $onboardingUser = $request->session()->get('onboarding_user');
+
+        return Inertia::render('auth/Onboarding', [
+            'user' => $onboardingUser,
+        ]);
+    }
+
+    public function completeOnboarding(Request $request)
+    {
+        if (Auth::check()) {
+            return redirect()->route('index');
+        }
+
+        if (! $request->session()->has('onboarding_user')) {
+            return redirect()->route('login')->with('error', 'Session expired. Please continue with Google again.');
+        }
+
+        $onboardingData = $request->session()->get('onboarding_user');
+
+        $validated = $request->validate([
+            'name' => ['required', 'string', 'max:255'],
+            'username' => [
+                'required',
+                'string',
+                'min:3',
+                'max:30',
+                'regex:/^[a-zA-Z0-9_]+$/',
+                'unique:users,username',
+            ],
+            'school' => ['required', 'string', 'max:255'],
+        ], [
+            'school.required' => 'Please enter your school, college, or institution name.',
+            'username.regex' => 'Username can only contain letters, numbers, and underscores.',
+            'username.unique' => 'This username is already taken. Please choose another one.',
+        ]);
+
+        $user = User::where('google_id', $onboardingData['google_id'])
+            ->orWhere('email', $onboardingData['email'])
+            ->first();
+
+        if (! $user) {
+            $user = User::create([
+                'name' => $validated['name'],
+                'username' => $validated['username'],
+                'email' => $onboardingData['email'],
+                'google_id' => $onboardingData['google_id'],
+                'institution' => $validated['school'],
+                'email_verified_at' => now(),
+            ]);
+
+            Mail::to($user->email)->queue(new WelcomeUserMail($user));
+        }
+
+        $request->session()->forget('onboarding_user');
+
+        Auth::login($user, remember: true);
+        $request->session()->regenerate();
+
+        $defaultUrl = $user->username
+            ? route('user.profile', $user->username)
+            : route('profile.edit');
+
+        return redirect()->intended($defaultUrl)->with('success', 'Account created successfully! Welcome to HSCStack.');
+    }
+
+    public function logout(Request $request)
+    {
+        Auth::logout();
+        $request->session()->invalidate();
+        $request->session()->regenerateToken();
+
+        return redirect()->route('index');
+    }
+}
diff --git a/resources/js/pages/auth/Login.vue b/resources/js/pages/auth/Login.vue
index dac62a37..e8a36597 100644
--- a/resources/js/pages/auth/Login.vue
+++ b/resources/js/pages/auth/Login.vue
@@ -141,10 +141,11 @@ const googleAuthUrl = redirectParam
                             >
                                 <span
                                     class="font-semibold text-slate-900 dark:text-gray-200"
-                                    >Instant 1-Click Access:</span
+                                    >Fast Google Access:</span
                                 >
-                                নতুন ইউজার হলে এক ক্লিকেই auto account create
-                                হবে, আর পুরাতন ইউজার হলে সরাসরি Login হয়ে যাবে।
+                                নতুন ইউজার হলে তথ্য সেটআপ করে অ্যাকাউন্ট তৈরি
+                                করতে পারবেন, আর পুরাতন ইউজার হলে সরাসরি Login
+                                হয়ে যাবে।
                             </div>
                         </div>
 
diff --git a/resources/js/pages/auth/Onboarding.vue b/resources/js/pages/auth/Onboarding.vue
new file mode 100644
index 00000000..f304ff29
--- /dev/null
+++ b/resources/js/pages/auth/Onboarding.vue
@@ -0,0 +1,301 @@
+<script setup lang="ts">
+import { Head, Link, useForm, usePage } from '@inertiajs/vue3';
+import {
+    User,
+    AtSign,
+    GraduationCap,
+    AlertCircle,
+    ArrowLeft,
+    CheckCircle2,
+    Loader2,
+} from 'lucide-vue-next';
+import { computed } from 'vue';
+
+interface OnboardingUser {
+    google_id: string;
+    email: string;
+    name: string;
+    avatar?: string | null;
+}
+
+const props = defineProps<{
+    user?: OnboardingUser;
+}>();
+
+const page = usePage();
+const flashError = computed(() => (page.props as any).flash?.error);
+
+const form = useForm({
+    name: props.user?.name || '',
+    username: '',
+    school: '',
+});
+
+const submit = () => {
+    form.post('/onboarding');
+};
+</script>
+
+<template>
+    <Head>
+        <title>Complete Your Profile - HSCStack</title>
+        <meta
+            name="description"
+            content="Set up your username, name, and school to complete your HSCStack account setup."
+        />
+    </Head>
+
+    <!-- Atmospheric Blobs -->
+    <div class="pointer-events-none fixed inset-0 z-0">
+        <div
+            class="absolute top-[-10%] left-[-10%] h-[50%] w-[50%] rounded-full bg-indigo-200/40 blur-[120px] dark:bg-indigo-500/10"
+        ></div>
+        <div
+            class="absolute right-[-5%] bottom-[10%] h-[40%] w-[40%] rounded-full bg-violet-200/30 blur-[100px] dark:bg-violet-500/10"
+        ></div>
+    </div>
+
+    <div
+        class="relative z-10 flex min-h-[85vh] items-center justify-center px-4 py-8 sm:px-6 sm:py-10"
+    >
+        <div class="w-full max-w-md">
+            <!-- Header -->
+            <div class="mb-5 text-center">
+                <h1
+                    class="text-2xl font-black tracking-tight text-slate-900 sm:text-3xl dark:text-gray-100"
+                >
+                    Almost there!
+                </h1>
+                <p
+                    class="mt-1.5 text-xs font-semibold text-slate-500 dark:text-gray-400"
+                >
+                    অ্যাকাউন্ট তৈরি সম্পন্ন করতে আপনার তথ্যগুলো নিশ্চিত করুন
+                </p>
+            </div>
+
+            <!-- Flash Error Alert -->
+            <div
+                v-if="flashError"
+                class="mb-6 flex items-start gap-3 rounded-2xl border border-rose-200 bg-rose-50/80 p-4 text-xs font-medium text-rose-700 backdrop-blur-sm dark:border-rose-500/30 dark:bg-rose-500/10 dark:text-rose-400"
+            >
+                <AlertCircle
+                    class="h-4 w-4 shrink-0 text-rose-600 dark:text-rose-400"
+                />
+                <div class="flex-1">{{ flashError }}</div>
+            </div>
+
+            <!-- Deep Shadow Card -->
+            <div
+                class="rounded-3xl border border-slate-200/80 bg-white/90 p-6 shadow-[0_20px_50px_rgba(8,11,46,0.08)] backdrop-blur-xl sm:p-8 dark:border-gray-800 dark:bg-gray-900/90 dark:shadow-[0_20px_50px_rgba(0,0,0,0.4)]"
+            >
+                <!-- Connected Google Account Badge -->
+                <div
+                    v-if="props.user?.email"
+                    class="mb-6 flex items-center gap-3 rounded-2xl border border-slate-100 bg-slate-50/80 p-3.5 dark:border-gray-800 dark:bg-gray-800/40"
+                >
+                    <img
+                        v-if="props.user.avatar"
+                        :src="props.user.avatar"
+                        :alt="props.user.name"
+                        class="h-10 w-10 shrink-0 rounded-full border border-slate-200 object-cover dark:border-gray-700"
+                    />
+                    <div
+                        v-else
+                        class="flex h-10 w-10 shrink-0 items-center justify-center rounded-full bg-indigo-100 font-bold text-indigo-700 dark:bg-indigo-900/50 dark:text-indigo-300"
+                    >
+                        {{ props.user.name?.charAt(0)?.toUpperCase() || 'U' }}
+                    </div>
+                    <div class="min-w-0 flex-1">
+                        <div class="flex items-center gap-1.5">
+                            <p
+                                class="truncate text-xs font-bold text-slate-800 dark:text-gray-200"
+                            >
+                                {{ props.user.email }}
+                            </p>
+                            <CheckCircle2
+                                class="h-3.5 w-3.5 shrink-0 text-emerald-500"
+                            />
+                        </div>
+                        <p
+                            class="text-[11px] text-slate-400 dark:text-gray-500"
+                        >
+                            Verified via Google
+                        </p>
+                    </div>
+                </div>
+
+                <!-- Onboarding Form -->
+                <form @submit.prevent="submit" class="space-y-4">
+                    <!-- Full Name -->
+                    <div>
+                        <label
+                            for="name"
+                            class="mb-1.5 block text-xs font-semibold text-slate-700 dark:text-gray-300"
+                        >
+                            Full Name <span class="text-rose-500">*</span>
+                        </label>
+                        <div class="relative">
+                            <div
+                                class="pointer-events-none absolute inset-y-0 left-0 flex items-center pl-3.5 text-slate-400 dark:text-gray-500"
+                            >
+                                <User class="h-4 w-4" />
+                            </div>
+                            <input
+                                v-model="form.name"
+                                type="text"
+                                id="name"
+                                required
+                                placeholder="Your full name"
+                                :disabled="form.processing"
+                                class="w-full rounded-xl border border-slate-300 bg-white py-2.5 pr-3.5 pl-10 text-sm text-slate-900 transition outline-none placeholder:text-slate-400 focus:border-indigo-500 focus:ring-2 focus:ring-indigo-500/20 disabled:bg-slate-50 dark:border-gray-700 dark:bg-gray-950 dark:text-gray-100 dark:placeholder:text-gray-500"
+                                :class="{
+                                    'border-rose-500 focus:ring-rose-500/20':
+                                        form.errors.name,
+                                }"
+                            />
+                        </div>
+                        <p
+                            v-if="form.errors.name"
+                            class="mt-1 text-xs text-rose-600 dark:text-rose-400"
+                        >
+                            {{ form.errors.name }}
+                        </p>
+                    </div>
+
+                    <!-- Username -->
+                    <div>
+                        <label
+                            for="username"
+                            class="mb-1.5 block text-xs font-semibold text-slate-700 dark:text-gray-300"
+                        >
+                            Username <span class="text-rose-500">*</span>
+                        </label>
+                        <div class="relative">
+                            <div
+                                class="pointer-events-none absolute inset-y-0 left-0 flex items-center pl-3.5 text-slate-400 dark:text-gray-500"
+                            >
+                                <AtSign class="h-4 w-4" />
+                            </div>
+                            <input
+                                v-model="form.username"
+                                type="text"
+                                id="username"
+                                required
+                                placeholder="your_username"
+                                :disabled="form.processing"
+                                class="w-full rounded-xl border border-slate-300 bg-white py-2.5 pr-3.5 pl-10 text-sm text-slate-900 transition outline-none placeholder:text-slate-400 focus:border-indigo-500 focus:ring-2 focus:ring-indigo-500/20 disabled:bg-slate-50 dark:border-gray-700 dark:bg-gray-950 dark:text-gray-100 dark:placeholder:text-gray-500"
+                                :class="{
+                                    'border-rose-500 focus:ring-rose-500/20':
+                                        form.errors.username,
+                                }"
+                            />
+                        </div>
+                        <p
+                            v-if="form.errors.username"
+                            class="mt-1 text-xs text-rose-600 dark:text-rose-400"
+                        >
+                            {{ form.errors.username }}
+                        </p>
+                        <p
+                            v-else
+                            class="mt-1 text-[11px] text-slate-400 dark:text-gray-500"
+                        >
+                            Letters, numbers, and underscores (3–30 chars).
+                        </p>
+                    </div>
+
+                    <!-- School / Institution -->
+                    <div>
+                        <label
+                            for="school"
+                            class="mb-1.5 block text-xs font-semibold text-slate-700 dark:text-gray-300"
+                        >
+                            School / College / Institution
+                            <span class="text-rose-500">*</span>
+                        </label>
+                        <div class="relative">
+                            <div
+                                class="pointer-events-none absolute inset-y-0 left-0 flex items-center pl-3.5 text-slate-400 dark:text-gray-500"
+                            >
+                                <GraduationCap class="h-4 w-4" />
+                            </div>
+                            <input
+                                v-model="form.school"
+                                type="text"
+                                id="school"
+                                required
+                                placeholder="e.g., Notre Dame College, Dhaka College, BUET"
+                                :disabled="form.processing"
+                                class="w-full rounded-xl border border-slate-300 bg-white py-2.5 pr-3.5 pl-10 text-sm text-slate-900 transition outline-none placeholder:text-slate-400 focus:border-indigo-500 focus:ring-2 focus:ring-indigo-500/20 disabled:bg-slate-50 dark:border-gray-700 dark:bg-gray-950 dark:text-gray-100 dark:placeholder:text-gray-500"
+                                :class="{
+                                    'border-rose-500 focus:ring-rose-500/20':
+                                        form.errors.school,
+                                }"
+                            />
+                        </div>
+                        <p
+                            v-if="form.errors.school"
+                            class="mt-1 text-xs text-rose-600 dark:text-rose-400"
+                        >
+                            {{ form.errors.school }}
+                        </p>
+                    </div>
+
+                    <!-- Submit Button -->
+                    <div class="pt-2">
+                        <button
+                            type="submit"
+                            :disabled="form.processing"
+                            class="flex w-full items-center justify-center gap-2 rounded-2xl bg-indigo-600 px-4 py-3.5 text-sm font-bold text-white shadow-xs transition-all hover:bg-indigo-700 hover:shadow-md active:scale-[0.98] disabled:cursor-not-allowed disabled:opacity-50 dark:bg-indigo-500 dark:hover:bg-indigo-600"
+                        >
+                            <Loader2
+                                v-if="form.processing"
+                                class="h-4 w-4 animate-spin"
+                            />
+                            <span>{{
+                                form.processing
+                                    ? 'Creating Account...'
+                                    : 'Create Account & Get Started'
+                            }}</span>
+                        </button>
+                    </div>
+                </form>
+
+                <!-- Terms & Privacy subtext -->
+                <div
+                    class="mt-6 border-t border-slate-100 pt-4 text-center dark:border-gray-800"
+                >
+                    <p
+                        class="text-[11px] leading-relaxed text-slate-400 dark:text-gray-500"
+                    >
+                        অ্যাকাউন্ট তৈরির মাধ্যমে আপনি আমাদের
+                        <Link
+                            href="/terms-service"
+                            class="font-medium text-slate-600 underline decoration-slate-300 hover:text-slate-900 dark:text-gray-400 dark:decoration-gray-600 dark:hover:text-gray-200"
+                        >
+                            Terms of Service
+                        </Link>
+                        ও
+                        <Link
+                            href="/privacy-policy"
+                            class="font-medium text-slate-600 underline decoration-slate-300 hover:text-slate-900 dark:text-gray-400 dark:decoration-gray-600 dark:hover:text-gray-200"
+                        >
+                            Privacy Policy </Link
+                        >-তে সম্মতি দিচ্ছেন।
+                    </p>
+                </div>
+            </div>
+
+            <!-- Cancel and Back link -->
+            <div class="mt-6 text-center">
+                <Link
+                    href="/login"
+                    class="inline-flex items-center gap-1.5 text-xs font-bold text-slate-400 transition-colors hover:text-slate-900 dark:text-gray-500 dark:hover:text-gray-200"
+                >
+                    <ArrowLeft class="h-3.5 w-3.5" />
+                    <span>Back to Sign In</span>
+                </Link>
+            </div>
+        </div>
+    </div>
+</template>
diff --git a/routes/web.php b/routes/web.php
index 3d29b952..de5cd748 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -1,7 +1,7 @@
 <?php
 
 use App\Http\Controllers\AboutUsController;
-use App\Http\Controllers\Admin\AuthController;
+use App\Http\Controllers\AuthController;
 use App\Http\Controllers\BlogController;
 use App\Http\Controllers\ChatController;
 use App\Http\Controllers\NodeController;
@@ -72,6 +72,8 @@
     Route::post('/logout', [AuthController::class, 'logout'])->name('logout');
     Route::get('/auth/google', [AuthController::class, 'redirectToGoogle'])->name('auth.google');
     Route::get('/auth/google/callback', [AuthController::class, 'handleGoogleCallback'])->name('auth.google.callback');
+    Route::get('/onboarding', [AuthController::class, 'showOnboarding'])->name('onboarding');
+    Route::post('/onboarding', [AuthController::class, 'completeOnboarding'])->name('onboarding.complete');
 
     Route::get('/blogs', [BlogController::class, 'index']);
     Route::get('/blogs/{blog}', [BlogController::class, 'show']);
diff --git a/tests/Feature/AuthenticationTest.php b/tests/Feature/AuthenticationTest.php
index 374ccc04..4dfc3efd 100644
--- a/tests/Feature/AuthenticationTest.php
+++ b/tests/Feature/AuthenticationTest.php
@@ -1,6 +1,8 @@
 <?php
 
+use App\Mail\WelcomeUserMail;
 use App\Models\User;
+use Illuminate\Support\Facades\Mail;
 use Laravel\Socialite\Facades\Socialite;
 
 test('login page is accessible', function () {
@@ -16,29 +18,156 @@
     $this->assertStringContainsString('accounts.google.com', $response->headers->get('Location'));
 });
 
-test('google auth creates new user account if not exists and flashes notice', function () {
+test('google auth transfers new user to onboarding without creating account immediately', function () {
     $abstractUser = Mockery::mock(Laravel\Socialite\Two\User::class);
     $abstractUser->shouldReceive('getId')->andReturn('google-id-12345');
     $abstractUser->shouldReceive('getEmail')->andReturn('newuser@example.com');
     $abstractUser->shouldReceive('getName')->andReturn('Google User');
     $abstractUser->shouldReceive('getNickname')->andReturn('googleuser');
+    $abstractUser->shouldReceive('getAvatar')->andReturn('https://example.com/avatar.jpg');
 
     Socialite::shouldReceive('driver->user')->andReturn($abstractUser);
 
     $response = $this->get(route('auth.google.callback'));
 
-    $user = User::where('email', 'newuser@example.com')->first();
-    $response->assertRedirect(route('user.profile', $user->username));
-    $response->assertSessionHas('success', 'Account not found. New account created.');
-    $this->assertAuthenticated();
-    $this->assertDatabaseHas('users', [
+    $response->assertRedirect(route('onboarding'));
+    $this->assertGuest();
+    $this->assertDatabaseMissing('users', [
         'email' => 'newuser@example.com',
-        'google_id' => 'google-id-12345',
-        'name' => 'Google User',
     ]);
+    $response->assertSessionHas('onboarding_user', function ($data) {
+        return $data['email'] === 'newuser@example.com'
+            && $data['google_id'] === 'google-id-12345'
+            && $data['name'] === 'Google User'
+            && $data['avatar'] === 'https://example.com/avatar.jpg';
+    });
+});
+
+test('onboarding page is accessible with onboarding session', function () {
+    $response = $this->withSession([
+        'onboarding_user' => [
+            'google_id' => 'google-id-12345',
+            'email' => 'newuser@example.com',
+            'name' => 'Google User',
+            'avatar' => null,
+        ],
+    ])->get(route('onboarding'));
+
+    $response->assertStatus(200);
+});
+
+test('onboarding page redirects to login without onboarding session', function () {
+    $response = $this->get(route('onboarding'));
+
+    $response->assertRedirect(route('login'));
+    $response->assertSessionHas('error', 'Please continue with Google to create an account.');
+});
+
+test('completing onboarding creates user, queues welcome mail, and logs in', function () {
+    Mail::fake();
+
+    $response = $this->withSession([
+        'onboarding_user' => [
+            'google_id' => 'google-id-12345',
+            'email' => 'newuser@example.com',
+            'name' => 'Google User',
+            'avatar' => null,
+        ],
+    ])->post(route('onboarding.complete'), [
+        'name' => 'Custom Name',
+        'username' => 'custom_handle',
+        'school' => 'Notre Dame College',
+    ]);
+
+    $user = User::where('email', 'newuser@example.com')->first();
+    $this->assertNotNull($user);
+    $this->assertEquals('Custom Name', $user->name);
+    $this->assertEquals('custom_handle', $user->username);
+    $this->assertEquals('Notre Dame College', $user->institution);
+    $this->assertEquals('google-id-12345', $user->google_id);
+    $this->assertNotNull($user->email_verified_at);
+
+    $this->assertAuthenticatedAs($user);
+    $response->assertRedirect(route('user.profile', 'custom_handle'));
+    $response->assertSessionHas('success');
+    $response->assertSessionMissing('onboarding_user');
+
+    Mail::assertQueued(WelcomeUserMail::class, function ($mail) {
+        return $mail->hasTo('newuser@example.com');
+    });
+});
+
+test('completing onboarding validates username uniqueness and format', function () {
+    User::factory()->create([
+        'username' => 'taken_handle',
+    ]);
+
+    $response = $this->withSession([
+        'onboarding_user' => [
+            'google_id' => 'google-id-12345',
+            'email' => 'newuser@example.com',
+            'name' => 'Google User',
+            'avatar' => null,
+        ],
+    ])->post(route('onboarding.complete'), [
+        'name' => 'Custom Name',
+        'username' => 'taken_handle',
+        'school' => 'Dhaka College',
+    ]);
+
+    $response->assertSessionHasErrors(['username']);
+    $this->assertGuest();
+});
+
+test('completing onboarding requires school field', function () {
+    $response = $this->withSession([
+        'onboarding_user' => [
+            'google_id' => 'google-id-12345',
+            'email' => 'newuser@example.com',
+            'name' => 'Google User',
+            'avatar' => null,
+        ],
+    ])->post(route('onboarding.complete'), [
+        'name' => 'Custom Name',
+        'username' => 'valid_handle',
+        'school' => '',
+    ]);
+
+    $response->assertSessionHasErrors(['school']);
+    $this->assertGuest();
+});
+
+test('redirects to custom redirect url after onboarding for new user', function () {
+    $this->get('/auth/google?redirect=/ai');
+
+    $abstractUser = Mockery::mock(Laravel\Socialite\Two\User::class);
+    $abstractUser->shouldReceive('getId')->andReturn('google-id-new-redirect');
+    $abstractUser->shouldReceive('getEmail')->andReturn('new-redirect@example.com');
+    $abstractUser->shouldReceive('getName')->andReturn('New Redirect User');
+    $abstractUser->shouldReceive('getNickname')->andReturn('newredirect');
+    $abstractUser->shouldReceive('getAvatar')->andReturn(null);
+
+    Socialite::shouldReceive('driver->user')->andReturn($abstractUser);
+
+    $callbackResponse = $this->get(route('auth.google.callback'));
+    $callbackResponse->assertRedirect(route('onboarding'));
+
+    // Complete onboarding with intended URL in session
+    $onboardResponse = $this->post(route('onboarding.complete'), [
+        'name' => 'New Redirect User',
+        'username' => 'new_redirect_user',
+        'school' => 'Dhaka College',
+    ]);
+
+    $onboardResponse->assertRedirect(url('/ai'));
 });
 
-test('redirects to custom redirect url after authentication if provided', function () {
+test('redirects to custom redirect url after authentication for existing user', function () {
+    $user = User::factory()->create([
+        'email' => 'redirect-test@example.com',
+        'google_id' => 'google-id-custom',
+    ]);
+
     $this->get('/auth/google?redirect=/ai');
 
     $abstractUser = Mockery::mock(Laravel\Socialite\Two\User::class);
@@ -54,9 +183,15 @@
     $response->assertRedirect(url('/ai'));
 });
 
-test('redirects to trusted subdomain after authentication if provided', function () {
+test('redirects to trusted subdomain after authentication for existing user', function () {
     config(['app.url' => 'https://hscstack.site']);
     $subdomainUrl = 'https://ssc2026.hscstack.site';
+
+    $user = User::factory()->create([
+        'email' => 'subdomain@example.com',
+        'google_id' => 'google-id-subdomain',
+    ]);
+
     $this->get('/auth/google?redirect='.urlencode($subdomainUrl));
 
     $abstractUser = Mockery::mock(Laravel\Socialite\Two\User::class);
@@ -101,7 +236,12 @@
     $response->assertSessionHas('error', 'Failed to authenticate with Google. Please try again.');
 });
 
-test('google auth redirects to intended url if set', function () {
+test('google auth redirects to intended url if set for existing user', function () {
+    $user = User::factory()->create([
+        'email' => 'intended@example.com',
+        'google_id' => 'google-id-intended',
+    ]);
+
     $abstractUser = Mockery::mock(Laravel\Socialite\Two\User::class);
     $abstractUser->shouldReceive('getId')->andReturn('google-id-intended');
     $abstractUser->shouldReceive('getEmail')->andReturn('intended@example.com');