diff --git a/lib/components/keyserver-connection-handler.js b/lib/components/keyserver-connection-handler.js
index d4df3ae89..60433fcee 100644
--- a/lib/components/keyserver-connection-handler.js
+++ b/lib/components/keyserver-connection-handler.js
@@ -1,434 +1,442 @@
 // @flow
 
 import invariant from 'invariant';
 import * as React from 'react';
 
 import {
   keyserverAuthActionTypes,
   logOutActionTypes,
   keyserverAuthRawAction,
   useLogOut,
 } from '../actions/user-actions.js';
 import { useCallKeyserverEndpointContext } from '../keyserver-conn/call-keyserver-endpoint-provider.react.js';
 import { extractKeyserverIDFromID } from '../keyserver-conn/keyserver-call-utils.js';
 import {
   CANCELLED_ERROR,
   type CallKeyserverEndpoint,
 } from '../keyserver-conn/keyserver-conn-types.js';
 import { useKeyserverRecoveryLogIn } from '../keyserver-conn/recovery-utils.js';
 import { filterThreadIDsInFilterList } from '../reducers/calendar-filters-reducer.js';
 import {
   connectionSelector,
   cookieSelector,
   deviceTokenSelector,
 } from '../selectors/keyserver-selectors.js';
 import { isLoggedInToKeyserver } from '../selectors/user-selectors.js';
 import { useInitialNotificationsEncryptedMessage } from '../shared/crypto-utils.js';
 import { IdentityClientContext } from '../shared/identity-client-context.js';
 import type { BaseSocketProps } from '../socket/socket.react.js';
 import {
   logInActionSources,
   type RecoveryActionSource,
   type AuthActionSource,
 } from '../types/account-types.js';
 import { authoritativeKeyserverID } from '../utils/authoritative-keyserver.js';
 import type { CallSingleKeyserverEndpoint } from '../utils/call-single-keyserver-endpoint.js';
 import { getConfig } from '../utils/config.js';
 import { getMessageForException } from '../utils/errors.js';
 import { useDispatchActionPromise } from '../utils/redux-promise-utils.js';
 import { useSelector } from '../utils/redux-utils.js';
 import {
   usingCommServicesAccessToken,
   relyingOnAuthoritativeKeyserver,
 } from '../utils/services-utils.js';
 import sleep from '../utils/sleep.js';
 
 type Props = {
   ...BaseSocketProps,
   +socketComponent: React.ComponentType<BaseSocketProps>,
 };
 
 const AUTH_RETRY_DELAY_MS = 60000;
 
 function KeyserverConnectionHandler(props: Props) {
   const { socketComponent: Socket, ...socketProps } = props;
   const { keyserverID } = props;
 
   const dispatchActionPromise = useDispatchActionPromise();
   const callLogOut = useLogOut();
 
   const { olmAPI } = getConfig();
 
   const hasConnectionIssue = useSelector(
     state => !!connectionSelector(keyserverID)(state)?.connectionIssue,
   );
   const cookie = useSelector(cookieSelector(keyserverID));
   const prevCookieRef = React.useRef(cookie);
   const notifsSessionReassignmentPromise = React.useRef<?Promise<mixed>>(null);
 
   React.useEffect(() => {
     const prevCookie = prevCookieRef.current;
     prevCookieRef.current = cookie;
 
     if (cookie === prevCookie || !cookie || !cookie.startsWith('user=')) {
       return;
     }
 
     notifsSessionReassignmentPromise.current = (async () => {
       await notifsSessionReassignmentPromise.current;
       await olmAPI.reassignNotificationsSession?.(
         prevCookie,
         cookie,
         keyserverID,
       );
     })();
   }, [cookie, keyserverID, olmAPI]);
 
   const dataLoaded = useSelector(state => state.dataLoaded);
 
   const keyserverDeviceToken = useSelector(deviceTokenSelector(keyserverID));
   // We have an assumption that we should be always connected to Ashoat's
   // keyserver. It is possible that a token which it has is correct, so we can
   // try to use it. In worst case it is invalid and our push-handler will try
   // to fix it.
   const ashoatKeyserverDeviceToken = useSelector(
     deviceTokenSelector(authoritativeKeyserverID()),
   );
   const deviceToken = keyserverDeviceToken ?? ashoatKeyserverDeviceToken;
 
   const navInfo = useSelector(state => state.navInfo);
   const calendarFilters = useSelector(state => state.calendarFilters);
   const calendarQuery = React.useMemo(() => {
     const filters = filterThreadIDsInFilterList(
       calendarFilters,
       (threadID: string) => extractKeyserverIDFromID(threadID) === keyserverID,
     );
     return {
       startDate: navInfo.startDate,
       endDate: navInfo.endDate,
       filters,
     };
   }, [calendarFilters, keyserverID, navInfo.endDate, navInfo.startDate]);
 
   React.useEffect(() => {
     if (
       hasConnectionIssue &&
       keyserverID === authoritativeKeyserverID() &&
       relyingOnAuthoritativeKeyserver
     ) {
       void dispatchActionPromise(logOutActionTypes, callLogOut());
     }
   }, [callLogOut, hasConnectionIssue, dispatchActionPromise, keyserverID]);
 
   const identityContext = React.useContext(IdentityClientContext);
   invariant(identityContext, 'Identity context should be set');
   const { identityClient, getAuthMetadata } = identityContext;
 
-  const preRequestUserInfo = useSelector(state => state.currentUserInfo);
+  const currentUserInfo = useSelector(state => state.currentUserInfo);
   const innerPerformAuth = React.useCallback(
     (
       authActionSource: AuthActionSource,
       setInProgress: boolean => mixed,
       hasBeenCancelled: () => boolean,
       doNotRegister: boolean,
     ) =>
       async (innerCallKeyserverEndpoint: CallKeyserverEndpoint) => {
         try {
           const [keyserverKeys] = await Promise.all([
             identityClient.getKeyserverKeys(keyserverID),
             olmAPI.initializeCryptoAccount(),
           ]);
 
           if (hasBeenCancelled()) {
             throw new Error(CANCELLED_ERROR);
           }
 
           const [notifsSession, contentSession, { userID, deviceID }] =
             await Promise.all([
               olmAPI.notificationsSessionCreator(
                 cookie,
                 keyserverKeys.identityKeysBlob.notificationIdentityPublicKeys,
                 keyserverKeys.notifInitializationInfo,
                 keyserverID,
               ),
               olmAPI.contentOutboundSessionCreator(
                 keyserverKeys.identityKeysBlob.primaryIdentityPublicKeys,
                 keyserverKeys.contentInitializationInfo,
               ),
               getAuthMetadata(),
             ]);
 
           invariant(userID, 'userID should be set');
           invariant(deviceID, 'deviceID should be set');
 
           const deviceTokenUpdateInput = deviceToken
             ? { [keyserverID]: { deviceToken } }
             : {};
 
           if (hasBeenCancelled()) {
             throw new Error(CANCELLED_ERROR);
           }
 
           const authPromise = keyserverAuthRawAction(
             innerCallKeyserverEndpoint,
           )({
             userID,
             deviceID,
             doNotRegister,
             calendarQuery,
             deviceTokenUpdateInput,
             authActionSource,
             keyserverData: {
               [keyserverID]: {
                 initialContentEncryptedMessage:
                   contentSession.encryptedData.message,
                 initialNotificationsEncryptedMessage: notifsSession,
               },
             },
-            preRequestUserInfo,
+            preRequestUserInfo: currentUserInfo,
           });
 
           await dispatchActionPromise(keyserverAuthActionTypes, authPromise);
         } catch (e) {
           if (hasBeenCancelled()) {
             return;
           }
           console.log(
             `Error while authenticating to keyserver with id ${keyserverID}`,
             e,
           );
           throw e;
         } finally {
           if (!hasBeenCancelled()) {
             void (async () => {
               await sleep(AUTH_RETRY_DELAY_MS);
               setInProgress(false);
             })();
           }
         }
       },
     [
       calendarQuery,
       cookie,
       deviceToken,
       dispatchActionPromise,
       getAuthMetadata,
       identityClient,
       keyserverID,
       olmAPI,
-      preRequestUserInfo,
+      currentUserInfo,
     ],
   );
 
   const [authInProgress, setAuthInProgress] = React.useState(false);
   const { callKeyserverEndpoint } = useCallKeyserverEndpointContext();
   const performAuth = React.useCallback(() => {
     setAuthInProgress(true);
 
     let cancelled = false;
     const cancel = () => {
       cancelled = true;
       setAuthInProgress(false);
     };
     const hasBeenCancelled = () => cancelled;
 
     const promise = (async () => {
       try {
         await innerPerformAuth(
           process.env.BROWSER
             ? logInActionSources.keyserverAuthFromWeb
             : logInActionSources.keyserverAuthFromNative,
           setAuthInProgress,
           hasBeenCancelled,
           false,
         )(callKeyserverEndpoint);
       } catch (e) {
         if (
           !dataLoaded &&
           keyserverID === authoritativeKeyserverID() &&
           relyingOnAuthoritativeKeyserver
         ) {
           await dispatchActionPromise(logOutActionTypes, callLogOut());
         }
       }
     })();
 
     return [promise, cancel];
   }, [
     innerPerformAuth,
     callKeyserverEndpoint,
     dataLoaded,
     keyserverID,
     dispatchActionPromise,
     callLogOut,
   ]);
 
   const activeSessionRecovery = useSelector(
     state =>
       state.keyserverStore.keyserverInfos[keyserverID]?.connection
         .activeSessionRecovery,
   );
 
   // This async function asks the keyserver for its keys, whereas performAuth
   // above gets the keyserver's keys from the identity service
   const getInitialNotificationsEncryptedMessageForRecovery =
     useInitialNotificationsEncryptedMessage(keyserverID);
 
   const { resolveKeyserverSessionInvalidationUsingNativeCredentials } =
     getConfig();
   const innerPerformRecovery = React.useCallback(
     (
       recoveryActionSource: RecoveryActionSource,
       setInProgress: boolean => mixed,
       hasBeenCancelled: () => boolean,
     ) =>
       async (
         callSingleKeyserverEndpoint: CallSingleKeyserverEndpoint,
         innerCallKeyserverEndpoint: CallKeyserverEndpoint,
       ) => {
         if (usingCommServicesAccessToken) {
           try {
             await innerPerformAuth(
               recoveryActionSource,
               setInProgress,
               hasBeenCancelled,
               true,
             )(innerCallKeyserverEndpoint);
           } catch (e) {
             console.log(
               `Tried to recover session with keyserver ${keyserverID} but got ` +
                 `error. Exception: ` +
                 (getMessageForException(e) ?? '{no exception message}'),
             );
           }
           return;
         }
         if (!resolveKeyserverSessionInvalidationUsingNativeCredentials) {
           return;
         }
         await resolveKeyserverSessionInvalidationUsingNativeCredentials(
           callSingleKeyserverEndpoint,
           innerCallKeyserverEndpoint,
           dispatchActionPromise,
           recoveryActionSource,
           keyserverID,
           getInitialNotificationsEncryptedMessageForRecovery,
           hasBeenCancelled,
         );
       },
     [
       innerPerformAuth,
       resolveKeyserverSessionInvalidationUsingNativeCredentials,
       dispatchActionPromise,
       keyserverID,
       getInitialNotificationsEncryptedMessageForRecovery,
     ],
   );
 
   const keyserverRecoveryLogIn = useKeyserverRecoveryLogIn(keyserverID);
   const performRecovery = React.useCallback(
     (recoveryActionSource: RecoveryActionSource) => {
       setAuthInProgress(true);
 
       let cancelled = false;
       const cancel = () => {
         cancelled = true;
         setAuthInProgress(false);
       };
       const hasBeenCancelled = () => cancelled;
 
       const promise = (async () => {
         try {
           await keyserverRecoveryLogIn(
             recoveryActionSource,
             innerPerformRecovery(
               recoveryActionSource,
               setAuthInProgress,
               hasBeenCancelled,
             ),
             hasBeenCancelled,
           );
         } finally {
           if (!cancelled) {
             setAuthInProgress(false);
           }
         }
       })();
 
       return [promise, cancel];
     },
     [keyserverRecoveryLogIn, innerPerformRecovery],
   );
 
   const cancelPendingAuth = React.useRef<?() => void>(null);
   const prevPerformAuth = React.useRef(performAuth);
-  const isUserAuthenticated = useSelector(isLoggedInToKeyserver(keyserverID));
   const hasAccessToken = useSelector(state => !!state.commServicesAccessToken);
 
+  const isUserLoggedInToKeyserver = useSelector(
+    isLoggedInToKeyserver(keyserverID),
+  );
+  const canInitiateRecovery =
+    !!currentUserInfo &&
+    !currentUserInfo.anonymous &&
+    isUserLoggedInToKeyserver;
+
   const cancelPendingRecovery = React.useRef<?() => void>(null);
   const prevPerformRecovery = React.useRef(performRecovery);
 
   React.useEffect(() => {
-    if (activeSessionRecovery && isUserAuthenticated) {
+    if (activeSessionRecovery && canInitiateRecovery) {
       cancelPendingAuth.current?.();
       cancelPendingAuth.current = null;
 
       if (prevPerformRecovery.current !== performRecovery) {
         cancelPendingRecovery.current?.();
         cancelPendingRecovery.current = null;
         prevPerformRecovery.current = performRecovery;
       }
 
       if (!authInProgress) {
         const [, cancel] = performRecovery(activeSessionRecovery);
         cancelPendingRecovery.current = cancel;
       }
 
       return;
     }
 
     cancelPendingRecovery.current?.();
     cancelPendingRecovery.current = null;
 
     if (!hasAccessToken) {
       cancelPendingAuth.current?.();
       cancelPendingAuth.current = null;
     }
 
     if (
       !usingCommServicesAccessToken ||
-      isUserAuthenticated ||
+      isUserLoggedInToKeyserver ||
       !hasAccessToken
     ) {
       return;
     }
 
     if (prevPerformAuth.current !== performAuth) {
       cancelPendingAuth.current?.();
       cancelPendingAuth.current = null;
     }
     prevPerformAuth.current = performAuth;
 
     if (authInProgress) {
       return;
     }
 
     const [, cancel] = performAuth();
     cancelPendingAuth.current = cancel;
   }, [
     activeSessionRecovery,
     authInProgress,
     performRecovery,
     hasAccessToken,
-    isUserAuthenticated,
+    isUserLoggedInToKeyserver,
+    canInitiateRecovery,
     performAuth,
   ]);
 
   return <Socket {...socketProps} />;
 }
 
 const Handler: React.ComponentType<Props> = React.memo<Props>(
   KeyserverConnectionHandler,
 );
 
 export default Handler;