diff --git a/functions/src/create-user.ts b/functions/src/create-user.ts
index 55fac600..35f8974b 100644
--- a/functions/src/create-user.ts
+++ b/functions/src/create-user.ts
@@ -14,7 +14,11 @@ export const createUser = functions
 
     const preexistingUser = await getUser(userId)
     if (preexistingUser)
-      return { status: 'error', message: 'User already created' }
+      return {
+        status: 'error',
+        message: 'User already created',
+        user: preexistingUser,
+      }
 
     const fbUser = await admin.auth().getUser(userId)
 
@@ -38,6 +42,8 @@ export const createUser = functions
       avatarUrl,
       balance: STARTING_BALANCE,
       createdTime: Date.now(),
+      totalPnLCached: 0,
+      creatorVolumeCached: 0,
     }
 
     await firestore.collection('users').doc(userId).create(user)
diff --git a/functions/src/emails.ts b/functions/src/emails.ts
index d7318caa..3dd0873f 100644
--- a/functions/src/emails.ts
+++ b/functions/src/emails.ts
@@ -1,3 +1,5 @@
+import * as admin from 'firebase-admin'
+
 import { Contract } from '../../common/contract'
 import { User } from '../../common/user'
 import { sendTemplateEmail } from './send-email'
@@ -22,6 +24,10 @@ export const sendMarketResolutionEmail = async (
   const user = await getUser(userId)
   if (!user) return
 
+  const fbUser = await admin.auth().getUser(userId)
+  const email = fbUser.email
+  if (!email) return
+
   const outcome = toDisplayResolution[resolution]
 
   const subject = `Resolved ${outcome}: ${contract.question}`
@@ -39,7 +45,7 @@ export const sendMarketResolutionEmail = async (
   // https://app.mailgun.com/app/sending/domains/mg.manifold.markets/templates/edit/market-resolved/initial
   // Mailgun username: james@mantic.markets
 
-  await sendTemplateEmail(user.email, subject, 'market-resolved', templateData)
+  await sendTemplateEmail(email, subject, 'market-resolved', templateData)
 }
 
 const toDisplayResolution = { YES: 'YES', NO: 'NO', CANCEL: 'N/A', MKT: 'MKT' }
diff --git a/web/components/profile-menu.tsx b/web/components/profile-menu.tsx
index 4bbe48c4..1d685769 100644
--- a/web/components/profile-menu.tsx
+++ b/web/components/profile-menu.tsx
@@ -72,7 +72,9 @@ function ProfileSummary(props: { user: User }) {
   return (
     <Col className="avatar items-center sm:flex-row gap-2 sm:gap-0">
       <div className="rounded-full w-10 h-10 sm:mr-4">
-        <Image src={user.avatarUrl} width={40} height={40} />
+        {user.avatarUrl && (
+          <Image src={user.avatarUrl} width={40} height={40} />
+        )}
       </div>
       <div className="truncate text-left" style={{ maxWidth: 170 }}>
         <div className="hidden sm:flex">{user.name}</div>
diff --git a/web/components/user-page.tsx b/web/components/user-page.tsx
index f75dcf7e..4784c295 100644
--- a/web/components/user-page.tsx
+++ b/web/components/user-page.tsx
@@ -43,7 +43,6 @@ function UserCard(props: { user: User; showPrivateInfo?: boolean }) {
 
         {showPrivateInfo && (
           <>
-            <p>{user?.email}</p>
             <p>{formatMoney(user?.balance)}</p>
             <div className="card-actions">
               <button
diff --git a/web/lib/firebase/init.ts b/web/lib/firebase/init.ts
index 98734946..ba10545a 100644
--- a/web/lib/firebase/init.ts
+++ b/web/lib/firebase/init.ts
@@ -2,8 +2,8 @@ import { getFirestore } from '@firebase/firestore'
 import { initializeApp } from 'firebase/app'
 
 // TODO: Reenable this when we have a way to set the Firebase db in dev
-// export const isProd = process.env.NODE_ENV === 'production'
-export const isProd = true
+export const isProd = process.env.NODE_ENV === 'production'
+// export const isProd = true
 
 const firebaseConfig = isProd
   ? {