diff --git a/src/state/session/index.tsx b/src/state/session/index.tsx
index 37b10876..2eb389bd 100644
--- a/src/state/session/index.tsx
+++ b/src/state/session/index.tsx
@@ -142,6 +142,7 @@ function createPersistSessionHandler(
       handle: session?.handle || account.handle,
       email: session?.email || account.email,
       emailConfirmed: session?.emailConfirmed || account.emailConfirmed,
+      emailAuthFactor: session?.emailAuthFactor || account.emailAuthFactor,
       deactivated: isSessionDeactivated(session?.accessJwt),
       pdsUrl: agent.pdsUrl?.toString(),
 
@@ -271,8 +272,9 @@ export function Provider({children}: React.PropsWithChildren<{}>) {
         service: agent.service.toString(),
         did: agent.session.did,
         handle: agent.session.handle,
-        email: agent.session.email!, // TODO this is always defined?
-        emailConfirmed: false,
+        email: agent.session.email,
+        emailConfirmed: agent.session.emailConfirmed,
+        emailAuthFactor: agent.session.emailAuthFactor,
         refreshJwt: agent.session.refreshJwt,
         accessJwt: agent.session.accessJwt,
         deactivated,
@@ -324,7 +326,7 @@ export function Provider({children}: React.PropsWithChildren<{}>) {
         did: agent.session.did,
         handle: agent.session.handle,
         email: agent.session.email,
-        emailConfirmed: agent.session.emailConfirmed || false,
+        emailConfirmed: agent.session.emailConfirmed,
         emailAuthFactor: agent.session.emailAuthFactor,
         refreshJwt: agent.session.refreshJwt,
         accessJwt: agent.session.accessJwt,
@@ -506,8 +508,8 @@ export function Provider({children}: React.PropsWithChildren<{}>) {
           did: agent.session.did,
           handle: agent.session.handle,
           email: agent.session.email,
-          emailConfirmed: agent.session.emailConfirmed || false,
-          emailAuthFactor: agent.session.emailAuthFactor || false,
+          emailConfirmed: agent.session.emailConfirmed,
+          emailAuthFactor: agent.session.emailAuthFactor,
           refreshJwt: agent.session.refreshJwt,
           accessJwt: agent.session.accessJwt,
           deactivated: isSessionDeactivated(agent.session.accessJwt),