diff --git a/apps/web/app/(marketing)/_components/site-header-account-section.tsx b/apps/web/app/(marketing)/_components/site-header-account-section.tsx
index 2d7d793ed..e986cb47a 100644
--- a/apps/web/app/(marketing)/_components/site-header-account-section.tsx
+++ b/apps/web/app/(marketing)/_components/site-header-account-section.tsx
@@ -39,13 +39,14 @@ export function SiteHeaderAccountSection({
 function SuspendedPersonalAccountDropdown(props: { user: User | null }) {
   const signOut = useSignOut();
   const user = useUser(props.user);
+  const userData = user.data ?? props.user ?? null;
 
-  if (user.data) {
+  if (userData) {
     return (
       <PersonalAccountDropdown
         paths={paths}
         features={features}
-        user={user.data}
+        user={userData}
         signOutRequested={() => signOut.mutateAsync()}
       />
     );
diff --git a/apps/web/app/layout.tsx b/apps/web/app/layout.tsx
index a8030a0a8..a967963bd 100644
--- a/apps/web/app/layout.tsx
+++ b/apps/web/app/layout.tsx
@@ -51,14 +51,16 @@ export default async function RootLayout({
 
 function getClassName(theme?: string) {
   const dark = theme === 'dark';
+  const light = theme === 'light';
 
   return cn(
     'min-h-screen bg-background antialiased',
-    {
-      dark,
-    },
     sans.variable,
     heading.variable,
+    {
+      dark,
+      light,
+    },
   );
 }