diff --git a/web/account/traditional-login-form.react.js b/web/account/traditional-login-form.react.js
index 3f027b7ac..9bd4cb340 100644
--- a/web/account/traditional-login-form.react.js
+++ b/web/account/traditional-login-form.react.js
@@ -1,236 +1,194 @@
 // @flow
 
-import olm from '@matrix-org/olm';
 import invariant from 'invariant';
 import * as React from 'react';
 
 import { logIn, logInActionTypes } from 'lib/actions/user-actions.js';
 import { useModalContext } from 'lib/components/modal-provider.react.js';
 import { createLoadingStatusSelector } from 'lib/selectors/loading-selectors.js';
 import {
   oldValidUsernameRegex,
   validEmailRegex,
 } from 'lib/shared/account-utils.js';
 import type {
   LogInExtraInfo,
   LogInStartingPayload,
 } from 'lib/types/account-types.js';
 import { logInActionSources } from 'lib/types/account-types.js';
-import type {
-  OLMIdentityKeys,
-  PickledOLMAccount,
-  SignedIdentityKeysBlob,
-} from 'lib/types/crypto-types.js';
+import type { SignedIdentityKeysBlob } from 'lib/types/crypto-types.js';
 import {
   useDispatchActionPromise,
   useServerCall,
 } from 'lib/utils/action-utils.js';
 
 import HeaderSeparator from './header-separator.react.js';
 import css from './log-in-form.css';
 import PasswordInput from './password-input.react.js';
 import Button from '../components/button.react.js';
 import LoadingIndicator from '../loading-indicator.react.js';
 import Input from '../modals/input.react.js';
 import { useSelector } from '../redux/redux-utils.js';
 import { webLogInExtraInfoSelector } from '../selectors/account-selectors.js';
+import { signedIdentityKeysBlobSelector } from '../selectors/socket-selectors.js';
 
 const loadingStatusSelector = createLoadingStatusSelector(logInActionTypes);
 function TraditionalLoginForm(): React.Node {
   const inputDisabled = useSelector(loadingStatusSelector) === 'loading';
   const loginExtraInfo = useSelector(webLogInExtraInfoSelector);
   const callLogIn = useServerCall(logIn);
   const dispatchActionPromise = useDispatchActionPromise();
   const modalContext = useModalContext();
 
-  const primaryIdentityPublicKeys: ?OLMIdentityKeys = useSelector(
-    state => state.cryptoStore.primaryIdentityKeys,
-  );
-  const notificationIdentityPublicKeys: ?OLMIdentityKeys = useSelector(
-    state => state.cryptoStore.notificationIdentityKeys,
-  );
-  const primaryAccount: ?PickledOLMAccount = useSelector(
-    state => state.cryptoStore.primaryAccount,
+  const signedIdentityKeysBlob: ?SignedIdentityKeysBlob = useSelector(
+    signedIdentityKeysBlobSelector,
   );
 
   const usernameInputRef = React.useRef();
   React.useEffect(() => {
     usernameInputRef.current?.focus();
   }, []);
 
   const [username, setUsername] = React.useState<string>('');
   const onUsernameChange = React.useCallback(e => {
     invariant(e.target instanceof HTMLInputElement, 'target not input');
     setUsername(e.target.value);
   }, []);
 
   const onUsernameBlur = React.useCallback(() => {
     setUsername(untrimmedUsername => untrimmedUsername.trim());
   }, []);
 
   const [password, setPassword] = React.useState<string>('');
   const onPasswordChange = React.useCallback(e => {
     invariant(e.target instanceof HTMLInputElement, 'target not input');
     setPassword(e.target.value);
   }, []);
 
   const [errorMessage, setErrorMessage] = React.useState<string>('');
 
   const logInAction = React.useCallback(
     async (extraInfo: LogInExtraInfo) => {
       try {
         invariant(
-          primaryIdentityPublicKeys,
-          'primaryIdentityPublicKeys must be set in logInAction',
-        );
-        invariant(
-          notificationIdentityPublicKeys,
-          'notificationIdentityPublicKeys must be set in logInAction',
-        );
-        invariant(primaryAccount, 'primaryAccount must be set in logInAction');
-
-        const primaryOLMAccount = new olm.Account();
-        primaryOLMAccount.unpickle(
-          primaryAccount.picklingKey,
-          primaryAccount.pickledAccount,
+          signedIdentityKeysBlob,
+          'signedIdentityKeysBlob must be set in logInAction',
         );
 
-        const payloadToBeSigned = JSON.stringify({
-          primaryIdentityPublicKeys,
-          notificationIdentityPublicKeys,
-        });
-        const signedIdentityKeysBlob: SignedIdentityKeysBlob = {
-          payload: payloadToBeSigned,
-          signature: primaryOLMAccount.sign(payloadToBeSigned),
-        };
-
         const result = await callLogIn({
           ...extraInfo,
           username,
           password,
           logInActionSource: logInActionSources.logInFromWebForm,
           signedIdentityKeysBlob,
         });
         modalContext.popModal();
         return result;
       } catch (e) {
         setUsername('');
         setPassword('');
         if (e.message === 'invalid_credentials') {
           setErrorMessage('incorrect username or password');
         } else {
           setErrorMessage('unknown error');
         }
         usernameInputRef.current?.focus();
         throw e;
       }
     },
-    [
-      callLogIn,
-      modalContext,
-      notificationIdentityPublicKeys,
-      password,
-      primaryAccount,
-      primaryIdentityPublicKeys,
-      username,
-    ],
+    [callLogIn, modalContext, password, signedIdentityKeysBlob, username],
   );
 
   const onSubmit = React.useCallback(
     (event: SyntheticEvent<HTMLElement>) => {
       event.preventDefault();
 
       if (username.search(validEmailRegex) > -1) {
         setUsername('');
         setErrorMessage('usernames only, not emails');
         usernameInputRef.current?.focus();
         return;
       } else if (username.search(oldValidUsernameRegex) === -1) {
         setUsername('');
         setErrorMessage('alphanumeric usernames only');
         usernameInputRef.current?.focus();
         return;
       } else if (password === '') {
         setErrorMessage('password is empty');
         usernameInputRef.current?.focus();
         return;
       }
 
       const extraInfo = loginExtraInfo();
       dispatchActionPromise(
         logInActionTypes,
         logInAction(extraInfo),
         undefined,
         ({ calendarQuery: extraInfo.calendarQuery }: LogInStartingPayload),
       );
     },
     [dispatchActionPromise, logInAction, loginExtraInfo, username, password],
   );
 
   const loginButtonContent = React.useMemo(() => {
     if (inputDisabled) {
       return <LoadingIndicator status="loading" />;
     }
     return 'Sign in';
   }, [inputDisabled]);
 
   const signInButtonColor = React.useMemo(
     () => ({ backgroundColor: '#6A20E3' }),
     [],
   );
 
   return (
     <form method="POST">
       <div>
         <h4>Sign in to Comm</h4>
         <HeaderSeparator />
         <div className={css.form_title}>Username</div>
         <div className={css.form_content}>
           <Input
             className={css.input}
             type="text"
             placeholder="Username"
             value={username}
             onChange={onUsernameChange}
             onBlur={onUsernameBlur}
             ref={usernameInputRef}
             disabled={inputDisabled}
           />
         </div>
       </div>
       <div>
         <div className={css.form_title}>Password</div>
         <div className={css.form_content}>
           <PasswordInput
             className={css.input}
             value={password}
             onChange={onPasswordChange}
             disabled={inputDisabled}
           />
         </div>
       </div>
       <div className={css.form_footer}>
         <Button
           variant="filled"
           type="submit"
           disabled={
-            primaryIdentityPublicKeys === null ||
-            primaryIdentityPublicKeys === undefined ||
-            notificationIdentityPublicKeys === null ||
-            notificationIdentityPublicKeys === undefined ||
-            primaryAccount === null ||
-            primaryAccount === undefined ||
+            signedIdentityKeysBlob === null ||
+            signedIdentityKeysBlob === undefined ||
             inputDisabled
           }
           onClick={onSubmit}
           buttonColor={signInButtonColor}
         >
           {loginButtonContent}
         </Button>
         <div className={css.modal_form_error}>{errorMessage}</div>
       </div>
     </form>
   );
 }
 
 export default TraditionalLoginForm;
diff --git a/web/selectors/socket-selectors.js b/web/selectors/socket-selectors.js
index f2e20661d..566da2579 100644
--- a/web/selectors/socket-selectors.js
+++ b/web/selectors/socket-selectors.js
@@ -1,131 +1,134 @@
 // @flow
 
 import olm from '@matrix-org/olm';
 import { createSelector } from 'reselect';
 
 import {
   getClientResponsesSelector,
   sessionStateFuncSelector,
 } from 'lib/selectors/socket-selectors.js';
 import { createOpenSocketFunction } from 'lib/shared/socket-utils.js';
 import type {
   OLMIdentityKeys,
   PickledOLMAccount,
   SignedIdentityKeysBlob,
+  IdentityKeysBlob,
 } from 'lib/types/crypto-types.js';
 import type {
   ClientServerRequest,
   ClientClientResponse,
 } from 'lib/types/request-types.js';
 import type {
   SessionIdentification,
   SessionState,
 } from 'lib/types/session-types.js';
 import type { OneTimeKeyGenerator } from 'lib/types/socket-types.js';
 
 import type { AppState } from '../redux/redux-setup.js';
 
 const openSocketSelector: (state: AppState) => () => WebSocket = createSelector(
   (state: AppState) => state.baseHref,
   createOpenSocketFunction,
 );
 
 const sessionIdentificationSelector: (
   state: AppState,
 ) => SessionIdentification = createSelector(
   (state: AppState) => state.sessionID,
   (sessionID: ?string): SessionIdentification => ({ sessionID }),
 );
 
 const signedIdentityKeysBlobSelector: (
   state: AppState,
 ) => ?SignedIdentityKeysBlob = createSelector(
   (state: AppState) => state.cryptoStore.primaryAccount,
   (state: AppState) => state.cryptoStore.primaryIdentityKeys,
   (state: AppState) => state.cryptoStore.notificationIdentityKeys,
   (
     primaryAccount: ?PickledOLMAccount,
     primaryIdentityKeys: ?OLMIdentityKeys,
     notificationIdentityKeys: ?OLMIdentityKeys,
   ) => {
     if (!primaryAccount || !primaryIdentityKeys || !notificationIdentityKeys) {
       return null;
     }
 
     const primaryOLMAccount = new olm.Account();
     primaryOLMAccount.unpickle(
       primaryAccount.picklingKey,
       primaryAccount.pickledAccount,
     );
 
-    const payloadToBeSigned = JSON.stringify({
-      primaryIdentityKeys,
-      notificationIdentityKeys,
-    });
+    const identityKeysBlob: IdentityKeysBlob = {
+      primaryIdentityPublicKeys: primaryIdentityKeys,
+      notificationIdentityPublicKeys: notificationIdentityKeys,
+    };
 
+    const payloadToBeSigned: string = JSON.stringify(identityKeysBlob);
     const signedIdentityKeysBlob: SignedIdentityKeysBlob = {
       payload: payloadToBeSigned,
       signature: primaryOLMAccount.sign(payloadToBeSigned),
     };
 
     return signedIdentityKeysBlob;
   },
 );
 
 const getSignedIdentityKeysBlobSelector: (
   state: AppState,
 ) => ?() => Promise<SignedIdentityKeysBlob> = createSelector(
   signedIdentityKeysBlobSelector,
   (signedIdentityKeysBlob: ?SignedIdentityKeysBlob) => {
     if (!signedIdentityKeysBlob) {
       return null;
     }
     return async () => signedIdentityKeysBlob;
   },
 );
 
 const webGetClientResponsesSelector: (
   state: AppState,
 ) => (
   serverRequests: $ReadOnlyArray<ClientServerRequest>,
 ) => Promise<$ReadOnlyArray<ClientClientResponse>> = createSelector(
   getClientResponsesSelector,
   getSignedIdentityKeysBlobSelector,
   (state: AppState) => state.navInfo.tab === 'calendar',
   (
       getClientResponsesFunc: (
         calendarActive: boolean,
         oneTimeKeyGenerator: ?OneTimeKeyGenerator,
         getSignedIdentityKeysBlob: ?() => Promise<SignedIdentityKeysBlob>,
         serverRequests: $ReadOnlyArray<ClientServerRequest>,
       ) => Promise<$ReadOnlyArray<ClientClientResponse>>,
       getSignedIdentityKeysBlob: ?() => Promise<SignedIdentityKeysBlob>,
       calendarActive: boolean,
     ) =>
     (serverRequests: $ReadOnlyArray<ClientServerRequest>) =>
       getClientResponsesFunc(
         calendarActive,
         null,
         getSignedIdentityKeysBlob,
         serverRequests,
       ),
 );
 
 const webSessionStateFuncSelector: (state: AppState) => () => SessionState =
   createSelector(
     sessionStateFuncSelector,
     (state: AppState) => state.navInfo.tab === 'calendar',
     (
         sessionStateFunc: (calendarActive: boolean) => SessionState,
         calendarActive: boolean,
       ) =>
       () =>
         sessionStateFunc(calendarActive),
   );
 
 export {
   openSocketSelector,
   sessionIdentificationSelector,
+  signedIdentityKeysBlobSelector,
   webGetClientResponsesSelector,
   webSessionStateFuncSelector,
 };