diff --git a/app/api/auth/[...nextauth]/route.ts b/app/api/auth/[...nextauth]/route.ts
index 5e1ea09..a9a4d88 100644
--- a/app/api/auth/[...nextauth]/route.ts
+++ b/app/api/auth/[...nextauth]/route.ts
@@ -13,29 +13,7 @@ const handler = NextAuth({
       // Allows callback URLs on the same origin
       else if (new URL(url).origin === baseUrl) return url;
       return baseUrl;
-    },
-    async session({ session, token }) {
-      console.log('Session callback:', { 
-        sessionBefore: session,
-        token: { ...token, refreshToken: '[REDACTED]' }
-      });
-      
-      if (token.error) {
-        console.error('Token error:', token.error);
-        throw new Error('RefreshAccessTokenError');
-      }
-
-      session.user.id = token.id;
-      session.user.email = token.email;
-      session.user.name = token.name;
-      session.user.role = token.role;
-
-      console.log('Session after:', { 
-        sessionAfter: { ...session, user: { ...session.user, id: '[REDACTED]' } }
-      });
-      
-      return session;
-    },
+    }
   },
 });
 
diff --git a/components/providers.tsx b/components/providers.tsx
index c1b80df..4d6d602 100644
--- a/components/providers.tsx
+++ b/components/providers.tsx
@@ -8,7 +8,7 @@ interface ProvidersProps {
 
 export function Providers({ children }: ProvidersProps) {
   return (
-    <SessionProvider refetchInterval={5 * 60}>
+    <SessionProvider refetchInterval={30 * 60}>
       {children}
     </SessionProvider>
   );
diff --git a/lib/auth.ts b/lib/auth.ts
index 763a0c2..41e8631 100644
--- a/lib/auth.ts
+++ b/lib/auth.ts
@@ -159,20 +159,30 @@ export const authOptions: NextAuthOptions = {
       }
     },
     async session({ session, token }) {
+      console.log('Session callback:', { 
+        sessionBefore: session,
+        token: { ...token, refreshToken: '[REDACTED]' }
+      });
+      
       if (token.error) {
+        console.error('Token error:', token.error);
         throw new Error('RefreshAccessTokenError');
       }
 
-      session.user.id = token.id;
-      session.user.email = token.email;
-      session.user.name = token.name;
-      session.user.role = token.role;
-      session.user.first_name = token.first_name;
-      session.user.last_name = token.last_name;
-      session.user.username = token.username;
-      session.accessToken = token.accessToken;
-      session.refreshToken = token.refreshToken;
+      session.user = {
+        id: token.sub ?? token.id ?? '',
+        email: token.email ?? '',
+        name: token.name ?? '',
+        role: token.role ?? 'user',
+        first_name: token.first_name ?? '',
+        last_name: token.last_name ?? '',
+        username: token.username ?? ''
+      };
 
+      console.log('Session after:', { 
+        sessionAfter: { ...session, user: { ...session.user, id: '[REDACTED]' } }
+      });
+      
       return session;
     },
   },