diff --git a/pages/card/[id].js b/pages/card/[id].js
index acde0bb..e7d92e3 100644
--- a/pages/card/[id].js
+++ b/pages/card/[id].js
@@ -2,6 +2,7 @@ import { useState, useEffect } from 'react';
 import { useRouter } from 'next/router';
 import Layout from '../../components/Layout';
 import { useIsAdmin } from '../../lib/admin-auth';
+import { useAuth } from '../../lib/use-auth';
 import CollectionSelectionModal from '../../components/CollectionSelectionModal';
 import { ManaCost, ColorIdentity, AdvancedManaCost } from '../../components/ManaSymbols';
 import ManaSymbolSettings from '../../components/ManaSymbolSettings';
@@ -9,11 +10,7 @@ import ManaSymbolSettings from '../../components/ManaSymbolSettings';
 export default function CardDetail() {
   const router = useRouter();
   const { id } = router.query;
-  
-  const user = {
-    email: 'me@randallstillwell.com',
-    role: 'user'
-  };
+  const { user } = useAuth();
 
   const [card, setCard] = useState(null);
   const [loading, setLoading] = useState(true);
diff --git a/pages/deck-builder.js b/pages/deck-builder.js
index 97b927b..02328ab 100644
--- a/pages/deck-builder.js
+++ b/pages/deck-builder.js
@@ -259,7 +259,7 @@ export default function DeckBuilder() {
 
   if (!user) {
     return (
-      <Layout>
+      <Layout user={user}>
         <div className="flex items-center justify-center min-h-screen">
           <div className="text-center">
             <h1 className="text-2xl font-bold mb-4">Please log in to use the deck builder</h1>
@@ -274,7 +274,7 @@ export default function DeckBuilder() {
 
   if (loading) {
     return (
-      <Layout>
+      <Layout user={user}>
         <div className="flex items-center justify-center min-h-screen">
           <div className="animate-spin rounded-full h-32 w-32 border-b-2 border-accent-ember"></div>
         </div>
@@ -284,7 +284,7 @@ export default function DeckBuilder() {
 
   if (!deck) {
     return (
-      <Layout>
+      <Layout user={user}>
         <div className="flex items-center justify-center min-h-screen">
           <div className="text-center">
             <h1 className="text-2xl font-bold mb-4">Deck not found</h1>
@@ -300,7 +300,7 @@ export default function DeckBuilder() {
   const stats = getDeckStats();
 
   return (
-    <Layout>
+    <Layout user={user}>
       <div className="max-w-7xl mx-auto px-4 sm:px-6 lg:px-8 py-8">
         {/* Header */}
         <div className="flex justify-between items-center mb-6">
diff --git a/pages/deck/[id].js b/pages/deck/[id].js
index e205830..2c975b3 100644
--- a/pages/deck/[id].js
+++ b/pages/deck/[id].js
@@ -129,7 +129,7 @@ export default function DeckDetail() {
 
   if (loading) {
     return (
-      <Layout>
+      <Layout user={user}>
         <div className="flex items-center justify-center min-h-screen">
           <div className="animate-spin rounded-full h-32 w-32 border-b-2 border-accent-ember"></div>
         </div>
@@ -139,7 +139,7 @@ export default function DeckDetail() {
 
   if (!deck) {
     return (
-      <Layout>
+      <Layout user={user}>
         <div className="flex items-center justify-center min-h-screen">
           <div className="text-center">
             <h1 className="text-2xl font-bold mb-4">Deck not found</h1>
@@ -157,7 +157,7 @@ export default function DeckDetail() {
   const isOwner = user && deck.user_id === user.userId;
 
   return (
-    <Layout>
+    <Layout user={user}>
       <div className="max-w-7xl mx-auto px-4 sm:px-6 lg:px-8 py-8">
         {/* Header */}
         <div className="flex justify-between items-start mb-8">
diff --git a/pages/decks.js b/pages/decks.js
index b98faaa..33aedf4 100644
--- a/pages/decks.js
+++ b/pages/decks.js
@@ -158,7 +158,7 @@ export default function Decks() {
 
   if (!user) {
     return (
-      <Layout>
+      <Layout user={user}>
         <div className="flex items-center justify-center min-h-screen">
           <div className="text-center">
             <h1 className="text-2xl font-bold mb-4">Please log in to view your decks</h1>
@@ -173,7 +173,7 @@ export default function Decks() {
 
   if (loading) {
     return (
-      <Layout>
+      <Layout user={user}>
         <div className="flex items-center justify-center min-h-screen">
           <div className="animate-spin rounded-full h-32 w-32 border-b-2 border-accent-ember"></div>
         </div>
@@ -182,7 +182,7 @@ export default function Decks() {
   }
 
   return (
-    <Layout>
+    <Layout user={user}>
       <div className="max-w-7xl mx-auto px-4 sm:px-6 lg:px-8 py-8">
         {/* Header */}
         <div className="flex justify-between items-center mb-8">
diff --git a/pages/profile.js b/pages/profile.js
index 54f15f6..2227f61 100644
--- a/pages/profile.js
+++ b/pages/profile.js
@@ -7,17 +7,7 @@ export default function Profile() {
   const fileInputRef = useRef(null);
   
   // User state
-  const [user, setUser] = useState({
-    email: 'me@randallstillwell.com',
-    role: 'admin',
-    first_name: '',
-    last_name: '',
-    username: '',
-    bio: '',
-    avatar_url: '',
-    favorite_games: ['MTG'],
-    created_at: new Date().toISOString()
-  });
+  const [user, setUser] = useState(null);
   
   // UI state
   const [loading, setLoading] = useState(true);
@@ -236,6 +226,7 @@ export default function Profile() {
   };
 
   const getDisplayName = () => {
+    if (!user) return '';
     if (user.first_name || user.last_name) {
       return `${user.first_name} ${user.last_name}`.trim();
     }
@@ -243,6 +234,7 @@ export default function Profile() {
   };
 
   const getInitials = () => {
+    if (!user) return '';
     if (user.first_name || user.last_name) {
       return `${user.first_name?.charAt(0) || ''}${user.last_name?.charAt(0) || ''}`.toUpperCase();
     }
@@ -296,7 +288,7 @@ export default function Profile() {
               {/* Avatar */}
               <div className="mb-6">
                 <div className="relative inline-block">
-                  {user.avatar_url ? (
+                  {user?.avatar_url ? (
                     <img
                       src={user.avatar_url}
                       alt="Profile"
@@ -358,29 +350,29 @@ export default function Profile() {
                 <h2 className="text-2xl font-bold mb-1" style={{ color: 'var(--text-primary)' }}>
                   {getDisplayName()}
                 </h2>
-                {user.username && (
+                {user?.username && (
                   <p className="text-lg mb-2" style={{ color: 'var(--text-secondary)' }}>
                     @{user.username}
                   </p>
                 )}
                 <p className="text-sm" style={{ color: 'var(--text-secondary)' }}>
-                  {user.email}
+                  {user?.email}
                 </p>
                 <div className="flex items-center justify-center mt-2">
                   <span 
                     className="px-3 py-1 text-xs rounded-full font-medium"
                     style={{ 
-                      backgroundColor: user.role === 'admin' ? 'var(--accent-ember)' : 'var(--accent-gold)',
+                      backgroundColor: user?.role === 'admin' ? 'var(--accent-ember)' : 'var(--accent-gold)',
                       color: 'white'
                     }}
                   >
-                    {user.role?.toUpperCase()}
+                    {user?.role?.toUpperCase()}
                   </span>
                 </div>
               </div>
 
               {/* Bio */}
-              {user.bio && (
+              {user?.bio && (
                 <div className="mb-6">
                   <p className="text-sm leading-relaxed" style={{ color: 'var(--text-secondary)' }}>
                     {user.bio}
@@ -389,11 +381,13 @@ export default function Profile() {
               )}
 
               {/* Member Since */}
-              <div className="text-center">
-                <p className="text-sm" style={{ color: 'var(--text-secondary)' }}>
-                  Member since {formatDate(user.created_at)}
-                </p>
-              </div>
+              {user?.created_at && (
+                <div className="text-center">
+                  <p className="text-sm" style={{ color: 'var(--text-secondary)' }}>
+                    Member since {formatDate(user.created_at)}
+                  </p>
+                </div>
+              )}
             </div>
 
             {/* Stats Card */}
@@ -468,7 +462,7 @@ export default function Profile() {
                       />
                     ) : (
                       <p className="py-2 text-sm" style={{ color: 'var(--text-secondary)' }}>
-                        {user.first_name || 'Not set'}
+                        {user?.first_name || 'Not set'}
                       </p>
                     )}
                   </div>
@@ -486,7 +480,7 @@ export default function Profile() {
                       />
                     ) : (
                       <p className="py-2 text-sm" style={{ color: 'var(--text-secondary)' }}>
-                        {user.last_name || 'Not set'}
+                        {user?.last_name || 'Not set'}
                       </p>
                     )}
                   </div>
@@ -507,7 +501,7 @@ export default function Profile() {
                     />
                   ) : (
                     <p className="py-2 text-sm" style={{ color: 'var(--text-secondary)' }}>
-                      {user.username || 'Not set'}
+                      {user?.username || 'Not set'}
                     </p>
                   )}
                 </div>
@@ -527,7 +521,7 @@ export default function Profile() {
                     />
                   ) : (
                     <p className="py-2 text-sm leading-relaxed" style={{ color: 'var(--text-secondary)' }}>
-                      {user.bio || 'No bio set'}
+                      {user?.bio || 'No bio set'}
                     </p>
                   )}
                 </div>
@@ -546,19 +540,19 @@ export default function Profile() {
                         className={`px-4 py-2 rounded-xl font-medium transition-all duration-200 flex items-center gap-2 ${
                           editMode ? 'cursor-pointer hover:shadow-md' : 'cursor-default'
                         } ${
-                          (editMode ? formData.favorite_games : user.favorite_games)?.includes(game.value)
+                          (editMode ? formData.favorite_games : user?.favorite_games)?.includes(game.value)
                             ? 'shadow-lg'
                             : 'hover:shadow-md'
                         }`}
                         style={{
-                          backgroundColor: (editMode ? formData.favorite_games : user.favorite_games)?.includes(game.value) 
+                          backgroundColor: (editMode ? formData.favorite_games : user?.favorite_games)?.includes(game.value) 
                             ? 'var(--accent-ember)' 
                             : 'var(--bg-tertiary)',
-                          color: (editMode ? formData.favorite_games : user.favorite_games)?.includes(game.value) 
+                          color: (editMode ? formData.favorite_games : user?.favorite_games)?.includes(game.value) 
                             ? 'white' 
                             : 'var(--text-primary)',
                           border: `1px solid ${
-                            (editMode ? formData.favorite_games : user.favorite_games)?.includes(game.value) 
+                            (editMode ? formData.favorite_games : user?.favorite_games)?.includes(game.value) 
                               ? 'var(--accent-ember)' 
                               : 'var(--border)'
                           }`
@@ -578,7 +572,7 @@ export default function Profile() {
                   </label>
                   <div className="flex items-center gap-3">
                     <p className="py-2 text-sm" style={{ color: 'var(--text-secondary)' }}>
-                      {user.email}
+                      {user?.email}
                     </p>
                     <span className="px-2 py-1 text-xs rounded-full bg-green-100 dark:bg-green-900/20 text-green-800 dark:text-green-200">
                       Verified
@@ -596,11 +590,11 @@ export default function Profile() {
                       onClick={() => {
                         setEditMode(false);
                         setFormData({
-                          first_name: user.first_name || '',
-                          last_name: user.last_name || '',
-                          username: user.username || '',
-                          bio: user.bio || '',
-                          favorite_games: user.favorite_games || []
+                          first_name: user?.first_name || '',
+                          last_name: user?.last_name || '',
+                          username: user?.username || '',
+                          bio: user?.bio || '',
+                          favorite_games: user?.favorite_games || []
                         });
                         setMessage({ type: '', text: '' });
                       }}
diff --git a/pages/scanner.js b/pages/scanner.js
index c180fed..4fa22b2 100644
--- a/pages/scanner.js
+++ b/pages/scanner.js
@@ -330,7 +330,7 @@ export default function Scanner() {
   }
 
   return (
-    <Layout>
+    <Layout user={user}>
       <div className="h-full flex flex-col">
         {/* Header */}
         <div className="px-6 pt-6 pb-4">
diff --git a/pages/settings.js b/pages/settings.js
index 9d4e721..5869f67 100644
--- a/pages/settings.js
+++ b/pages/settings.js
@@ -6,10 +6,7 @@ export default function Settings() {
   const router = useRouter();
   
   // User state
-  const [user, setUser] = useState({
-    email: 'me@randallstillwell.com',
-    role: 'admin'
-  });
+  const [user, setUser] = useState(null);
   
   // Settings state
   const [settings, setSettings] = useState({
@@ -303,7 +300,7 @@ export default function Settings() {
                       <div className="flex items-center gap-3">
                         <input
                           type="email"
-                          value={user.email}
+                          value={user?.email || ''}
                           disabled
                           className="input-field flex-1 opacity-50 cursor-not-allowed"
                         />