diff --git a/app/login/page.tsx b/app/login/page.tsx
index bc3b3f4..764b09d 100644
--- a/app/login/page.tsx
+++ b/app/login/page.tsx
@@ -10,7 +10,7 @@ export default function LoginPage() {
         <p className="text-center text-slate-600 mb-8">Track your billable hours</p>
 
         <button
-          onClick={() => signIn('github', { redirectTo: '/dashboard' })}
+          onClick={() => signIn('github', { callbackUrl: '/dashboard' })}
           className="w-full py-3 px-4 bg-slate-900 text-white font-semibold rounded-lg hover:bg-slate-800 transition-colors flex items-center justify-center gap-2"
         >
           <svg className="w-5 h-5" fill="currentColor" viewBox="0 0 24 24">
diff --git a/auth.ts b/auth.ts
index 98cafeb..3348652 100644
--- a/auth.ts
+++ b/auth.ts
@@ -3,6 +3,7 @@ import GithubProvider from 'next-auth/providers/github';
 
 export const authOptions: NextAuthOptions = {
   secret: process.env.NEXTAUTH_SECRET,
+  debug: process.env.NODE_ENV !== 'production',
   providers: [
     GithubProvider({
       clientId: process.env.AUTH_GITHUB_ID!,
diff --git a/middleware.ts b/middleware.ts
index 0947e57..dc3ef65 100644
--- a/middleware.ts
+++ b/middleware.ts
@@ -1,7 +1,21 @@
-import auth from 'next-auth/middleware';
+import auth, { type NextRequestWithAuth }  from 'next-auth/middleware';
+import { NextResponse } from 'next/server';
 
-export const middleware = auth;
+export async function middleware(req: NextRequestWithAuth) {
+  const url = req.nextUrl.clone();
+  if (url.pathname === '/api/auth/callback/github' && url.searchParams.has('iss')) {
+    url.searchParams.delete('iss');
+    return NextResponse.redirect(url);
+  }
+  return auth(req);
+}
 
 export const config = {
-  matcher: ['/dashboard/:path*', '/invoices/:path*', '/clients/:path*', '/timer/:path*'],
+  matcher: [
+    '/dashboard/:path*',
+    '/invoices/:path*',
+    '/clients/:path*',
+    '/timer/:path*',
+    '/api/auth/callback/github',
+  ],
 };