diff --git a/dashboard/15-final/app/ui/dashboard/sidenav.tsx b/dashboard/15-final/app/ui/dashboard/sidenav.tsx
index 0e03c89..1ad2ae2 100644
--- a/dashboard/15-final/app/ui/dashboard/sidenav.tsx
+++ b/dashboard/15-final/app/ui/dashboard/sidenav.tsx
@@ -21,7 +21,7 @@ export default function SideNav() {
         <form
           action={async () => {
             'use server';
-            await signOut({ redirectTo: '/' });
+            await signOut();
           }}
         >
           <button className="flex h-[48px] grow items-center justify-center gap-2 rounded-md bg-gray-50 p-3 text-sm font-medium hover:bg-sky-100 hover:text-blue-600 md:flex-none md:justify-start md:p-2 md:px-3">
diff --git a/dashboard/15-final/app/ui/login-form.tsx b/dashboard/15-final/app/ui/login-form.tsx
index 91baa85..bbcade8 100644
--- a/dashboard/15-final/app/ui/login-form.tsx
+++ b/dashboard/15-final/app/ui/login-form.tsx
@@ -17,10 +17,7 @@ export default async function LoginForm() {
         <form
           action={async (formData) => {
             'use server';
-            await signIn('credentials', {
-              ...Object.fromEntries(formData),
-              redirectTo: '/dashboard',
-            });
+            await signIn('credentials', Object.fromEntries(formData));
           }}
           className="space-y-3"
         >
diff --git a/dashboard/15-final/auth.config.ts b/dashboard/15-final/auth.config.ts
deleted file mode 100644
index 8dd8458..0000000
--- a/dashboard/15-final/auth.config.ts
+++ /dev/null
@@ -1,59 +0,0 @@
-import NextAuth from 'next-auth';
-import Credentials from 'next-auth/providers/credentials';
-import bcrypt from 'bcryptjs';
-import { sql } from '@vercel/postgres';
-import type { User } from '@/app/lib/definitions';
-
-async function getUser(email: string) {
-  try {
-    const user = await sql<User>`SELECT * from USERS where email=${email}`;
-    return user.rows[0];
-  } catch (error) {
-    console.error('Failed to fetch user:', error);
-    throw new Error('Failed to fetch user.');
-  }
-}
-
-export const {
-  handlers: { GET, POST },
-  auth,
-  signIn,
-  signOut,
-} = NextAuth({
-  providers: [
-    Credentials({
-      name: 'Sign-In with Credentials',
-      credentials: {
-        password: { label: 'Password', type: 'password' },
-        email: { label: 'Email', type: 'email' },
-      },
-      async authorize(credentials) {
-        const { email, password } = credentials ?? {};
-        // @ts-expect-error TODO: Validate email type with zod
-        const user = await getUser(email);
-        if (!user || !password) {
-          console.log('Missing credentials');
-          return null;
-        }
-
-        // @ts-expect-error TODO: Validate password type with zod
-        const passwordsMatch = await bcrypt.compare(password, user.password);
-
-        if (!passwordsMatch) {
-          console.log('Invalid credentials');
-          return null;
-        }
-
-        return { ...user, id: user.id.toString() };
-      },
-    }),
-  ],
-  callbacks: {
-    authorized({ auth, request: { nextUrl } }) {
-      return !nextUrl.pathname.startsWith('/dashboard') || !!auth?.user;
-    },
-  },
-  pages: {
-    signIn: '/login',
-  },
-});
diff --git a/dashboard/15-final/auth.ts b/dashboard/15-final/auth.ts
index 8dd8458..16ce778 100644
--- a/dashboard/15-final/auth.ts
+++ b/dashboard/15-final/auth.ts
@@ -3,6 +3,7 @@ import Credentials from 'next-auth/providers/credentials';
 import bcrypt from 'bcryptjs';
 import { sql } from '@vercel/postgres';
 import type { User } from '@/app/lib/definitions';
+import { NextResponse } from 'next/server';
 
 async function getUser(email: string) {
   try {
@@ -50,7 +51,18 @@ export const {
   ],
   callbacks: {
     authorized({ auth, request: { nextUrl } }) {
-      return !nextUrl.pathname.startsWith('/dashboard') || !!auth?.user;
+      const isLoggedIn = !!auth?.user;
+      const isOnDashboard = nextUrl.pathname.startsWith('/dashboard');
+      if (isOnDashboard) {
+        nextUrl.pathname = '/login';
+        if (!isLoggedIn) return NextResponse.redirect(nextUrl);
+        return true;
+      } else if (isLoggedIn) {
+        nextUrl.pathname = '/dashboard';
+        return NextResponse.redirect(nextUrl);
+      }
+
+      return true;
     },
   },
   pages: {
diff --git a/dashboard/15-final/middleware.ts b/dashboard/15-final/middleware.ts
index db54448..4596922 100644
--- a/dashboard/15-final/middleware.ts
+++ b/dashboard/15-final/middleware.ts
@@ -1 +1,5 @@
 export { auth as middleware } from './auth';
+
+export const config = {
+  matcher: ['/((?!api|_next/static|_next/image|favicon.ico).*)'],
+};