diff --git a/lib/shared/account-utils.js b/lib/shared/account-utils.js
--- a/lib/shared/account-utils.js
+++ b/lib/shared/account-utils.js
@@ -1,11 +1,5 @@
 // @flow
 
-import {
-  logInActionSources,
-  type LogInActionSource,
-} from '../types/account-types.js';
-import type { AppState } from '../types/redux-types.js';
-import type { PreRequestUserState } from '../types/session-types.js';
 import type { CurrentUserInfo } from '../types/user-types.js';
 import { isValidEthereumAddress } from '../utils/siwe-utils.js';
 
@@ -30,51 +24,6 @@
 
 const validHexColorRegex: RegExp = /^[a-fA-F0-9]{6}$/;
 
-function invalidSessionDowngrade(
-  currentReduxState: AppState,
-  actionCurrentUserInfo: ?CurrentUserInfo,
-  preRequestUserState: ?PreRequestUserState,
-): boolean {
-  // If this action represents a session downgrade - oldState has a loggedIn
-  // currentUserInfo, but the action has an anonymous one - then it is only
-  // valid if the currentUserInfo used for the request matches what oldState
-  // currently has. If the currentUserInfo in Redux has changed since the
-  // request, and is currently loggedIn, then the session downgrade does not
-  // apply to it. In this case we will simply swallow the action.
-  const currentCurrentUserInfo = currentReduxState.currentUserInfo;
-  return !!(
-    currentCurrentUserInfo &&
-    !currentCurrentUserInfo.anonymous &&
-    // Note that an undefined actionCurrentUserInfo represents an action that
-    // doesn't affect currentUserInfo, whereas a null one represents an action
-    // that sets it to null
-    (actionCurrentUserInfo === null ||
-      (actionCurrentUserInfo && actionCurrentUserInfo.anonymous)) &&
-    preRequestUserState &&
-    (preRequestUserState.currentUserInfo?.id !== currentCurrentUserInfo.id ||
-      preRequestUserState.cookie !== currentReduxState.cookie ||
-      preRequestUserState.sessionID !== currentReduxState.sessionID)
-  );
-}
-
-function invalidSessionRecovery(
-  currentReduxState: AppState,
-  actionCurrentUserInfo: CurrentUserInfo,
-  logInActionSource: ?LogInActionSource,
-): boolean {
-  if (
-    logInActionSource !==
-      logInActionSources.cookieInvalidationResolutionAttempt &&
-    logInActionSource !== logInActionSources.socketAuthErrorResolutionAttempt
-  ) {
-    return false;
-  }
-  return (
-    !currentReduxState.dataLoaded ||
-    currentReduxState.currentUserInfo?.id !== actionCurrentUserInfo.id
-  );
-}
-
 function accountHasPassword(currentUserInfo: ?CurrentUserInfo): boolean {
   return currentUserInfo?.username
     ? !isValidEthereumAddress(currentUserInfo.username)
@@ -108,8 +57,6 @@
   validUsernameRegex,
   oldValidUsernameRegex,
   validEmailRegex,
-  invalidSessionDowngrade,
-  invalidSessionRecovery,
   validHexColorRegex,
   accountHasPassword,
   userIdentifiedByETHAddress,
diff --git a/lib/shared/account-utils.js b/lib/shared/session-utils.js
copy from lib/shared/account-utils.js
copy to lib/shared/session-utils.js
--- a/lib/shared/account-utils.js
+++ b/lib/shared/session-utils.js
@@ -7,28 +7,6 @@
 import type { AppState } from '../types/redux-types.js';
 import type { PreRequestUserState } from '../types/session-types.js';
 import type { CurrentUserInfo } from '../types/user-types.js';
-import { isValidEthereumAddress } from '../utils/siwe-utils.js';
-
-const usernameMaxLength = 191;
-const usernameMinLength = 1;
-const secondCharRange = `{${usernameMinLength - 1},${usernameMaxLength - 1}}`;
-const validUsernameRegexString = `^[a-zA-Z0-9][a-zA-Z0-9-_]${secondCharRange}$`;
-const validUsernameRegex: RegExp = new RegExp(validUsernameRegexString);
-
-// usernames used to be less restrictive (eg single chars were allowed)
-// use oldValidUsername when dealing with existing accounts
-const oldValidUsernameRegexString = '[a-zA-Z0-9-_]+';
-const oldValidUsernameRegex: RegExp = new RegExp(
-  `^${oldValidUsernameRegexString}$`,
-);
-
-const validEmailRegex: RegExp = new RegExp(
-  /^[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+/.source +
-    /@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?/.source +
-    /(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$/.source,
-);
-
-const validHexColorRegex: RegExp = /^[a-fA-F0-9]{6}$/;
 
 function invalidSessionDowngrade(
   currentReduxState: AppState,
@@ -75,43 +53,4 @@
   );
 }
 
-function accountHasPassword(currentUserInfo: ?CurrentUserInfo): boolean {
-  return currentUserInfo?.username
-    ? !isValidEthereumAddress(currentUserInfo.username)
-    : false;
-}
-
-function userIdentifiedByETHAddress(
-  userInfo: ?{ +username?: ?string, ... },
-): boolean {
-  return userInfo?.username
-    ? isValidEthereumAddress(userInfo?.username)
-    : false;
-}
-
-function getETHAddressForUserInfo(
-  userInfo: ?{ +username?: ?string, ... },
-): ?string {
-  if (!userInfo) {
-    return null;
-  }
-  const { username } = userInfo;
-  const ethAddress =
-    username && userIdentifiedByETHAddress(userInfo) ? username : null;
-
-  return ethAddress;
-}
-
-export {
-  usernameMaxLength,
-  oldValidUsernameRegexString,
-  validUsernameRegex,
-  oldValidUsernameRegex,
-  validEmailRegex,
-  invalidSessionDowngrade,
-  invalidSessionRecovery,
-  validHexColorRegex,
-  accountHasPassword,
-  userIdentifiedByETHAddress,
-  getETHAddressForUserInfo,
-};
+export { invalidSessionDowngrade, invalidSessionRecovery };
diff --git a/native/redux/redux-setup.js b/native/redux/redux-setup.js
--- a/native/redux/redux-setup.js
+++ b/native/redux/redux-setup.js
@@ -18,7 +18,7 @@
 import {
   invalidSessionDowngrade,
   invalidSessionRecovery,
-} from 'lib/shared/account-utils.js';
+} from 'lib/shared/session-utils.js';
 import { isStaff } from 'lib/shared/staff-utils.js';
 import { defaultEnabledApps } from 'lib/types/enabled-apps.js';
 import { defaultCalendarFilters } from 'lib/types/filter-types.js';
diff --git a/web/redux/redux-setup.js b/web/redux/redux-setup.js
--- a/web/redux/redux-setup.js
+++ b/web/redux/redux-setup.js
@@ -11,7 +11,7 @@
 import { nonThreadCalendarFilters } from 'lib/selectors/calendar-filter-selectors.js';
 import { mostRecentlyReadThreadSelector } from 'lib/selectors/thread-selectors.js';
 import { isLoggedIn } from 'lib/selectors/user-selectors.js';
-import { invalidSessionDowngrade } from 'lib/shared/account-utils.js';
+import { invalidSessionDowngrade } from 'lib/shared/session-utils.js';
 import type { Shape } from 'lib/types/core.js';
 import type {
   CryptoStore,