diff --git a/webos/src/pillars/studio/PropertyEntity.tsx b/webos/src/pillars/studio/PropertyEntity.tsx
index 6679653..715221b 100644
--- a/webos/src/pillars/studio/PropertyEntity.tsx
+++ b/webos/src/pillars/studio/PropertyEntity.tsx
@@ -148,7 +148,7 @@ export default function PropertyEntity() {
               )}
               {property.amenities && (
                 <div className={styles.amenities}>
-                  {property.amenities.map((a, i) => (
+                  {(property.amenities || []).map((a, i) => (
                     <span key={i} className={`${styles.amenityChip} glass`}>{a}</span>
                   ))}
                 </div>
diff --git a/webos/src/pillars/studio/StudioPillar.tsx b/webos/src/pillars/studio/StudioPillar.tsx
index 3f1fd14..c686f72 100644
--- a/webos/src/pillars/studio/StudioPillar.tsx
+++ b/webos/src/pillars/studio/StudioPillar.tsx
@@ -54,7 +54,7 @@ function PropertiesSection() {
 
   return (
     <div className={styles.propGrid}>
-      {properties.map((prop, i) => (
+      {(properties || []).map((prop, i) => (
         <motion.button
           key={prop.id}
           className={`${styles.propCard} glass-card`}
diff --git a/webos/src/shared/layout/LoginPage.tsx b/webos/src/shared/layout/LoginPage.tsx
index 3025de6..a23882f 100644
--- a/webos/src/shared/layout/LoginPage.tsx
+++ b/webos/src/shared/layout/LoginPage.tsx
@@ -25,10 +25,23 @@ export function LoginPage() {
     setError('');
 
     try {
-      const { access_token, user } = await api.post<{ access_token: string; user: any }>(
+      const { access_token } = await api.post<{ access_token: string }>(
         '/auth/login',
         { email, password }
       );
+
+      const userProfile = await fetch('/api/auth/me', {
+        headers: { Authorization: `Bearer ${access_token}` }
+      }).then(r => r.json());
+
+      const user = {
+        id: userProfile.user_id,
+        name: userProfile.full_name,
+        email: userProfile.email,
+        role: userProfile.role,
+        avatarUrl: userProfile.avatar_url
+      };
+
       setSession(user, access_token);
       navigate('/command', { replace: true });
     } catch (err: any) {