diff --git a/web/modals/account/log-in-modal.react.js b/web/account/log-in-form.react.js
copy from web/modals/account/log-in-modal.react.js
copy to web/account/log-in-form.react.js
--- a/web/modals/account/log-in-modal.react.js
+++ b/web/account/log-in-form.react.js
@@ -3,31 +3,30 @@
 import invariant from 'invariant';
 import * as React from 'react';
 
-import { logInActionTypes, logIn } from 'lib/actions/user-actions';
-import { createLoadingStatusSelector } from 'lib/selectors/loading-selectors';
+import { logInActionTypes, logIn } from 'lib/actions/user-actions.js';
+import { createLoadingStatusSelector } from 'lib/selectors/loading-selectors.js';
 import {
-  validEmailRegex,
   oldValidUsernameRegex,
-} from 'lib/shared/account-utils';
+  validEmailRegex,
+} from 'lib/shared/account-utils.js';
 import type {
   LogInExtraInfo,
   LogInStartingPayload,
-} from 'lib/types/account-types';
+} from 'lib/types/account-types.js';
 import {
   useDispatchActionPromise,
   useServerCall,
-} from 'lib/utils/action-utils';
+} from 'lib/utils/action-utils.js';
 
-import Button from '../../components/button.react';
-import { useSelector } from '../../redux/redux-utils';
-import { webLogInExtraInfoSelector } from '../../selectors/account-selectors';
-import Input from '../input.react';
-import { useModalContext } from '../modal-provider.react';
-import Modal from '../modal.react';
-import css from './user-settings-modal.css';
+import Button from '../components/button.react.js';
+import css from '../modals/account/user-settings-modal.css';
+import Input from '../modals/input.react.js';
+import { useModalContext } from '../modals/modal-provider.react.js';
+import { useSelector } from '../redux/redux-utils.js';
+import { webLogInExtraInfoSelector } from '../selectors/account-selectors.js';
 
 const loadingStatusSelector = createLoadingStatusSelector(logInActionTypes);
-function LoginModal(): React.Node {
+function LoginForm(): React.Node {
   const inputDisabled = useSelector(loadingStatusSelector) === 'loading';
   const loginExtraInfo = useSelector(webLogInExtraInfoSelector);
   const callLogIn = useServerCall(logIn);
@@ -114,45 +113,43 @@
   );
 
   return (
-    <Modal name="Log in" onClose={modalContext.clearModal}>
-      <div className={css['modal-body']}>
-        <form method="POST">
-          <div>
-            <div className={css['form-title']}>Username</div>
-            <div className={css['form-content']}>
-              <Input
-                type="text"
-                placeholder="Username"
-                value={username}
-                onChange={onUsernameChange}
-                ref={usernameInputRef}
-                disabled={inputDisabled}
-              />
-            </div>
-          </div>
-          <div>
-            <div className={css['form-title']}>Password</div>
-            <div className={css['form-content']}>
-              <Input
-                type="password"
-                placeholder="Password"
-                value={password}
-                onChange={onPasswordChange}
-                ref={passwordInputRef}
-                disabled={inputDisabled}
-              />
-            </div>
+    <div className={css['modal-body']}>
+      <form method="POST">
+        <div>
+          <div className={css['form-title']}>Username</div>
+          <div className={css['form-content']}>
+            <Input
+              type="text"
+              placeholder="Username"
+              value={username}
+              onChange={onUsernameChange}
+              ref={usernameInputRef}
+              disabled={inputDisabled}
+            />
           </div>
-          <div className={css['form-footer']}>
-            <Button type="submit" disabled={inputDisabled} onClick={onSubmit}>
-              Log in
-            </Button>
-            <div className={css['modal-form-error']}>{errorMessage}</div>
+        </div>
+        <div>
+          <div className={css['form-title']}>Password</div>
+          <div className={css['form-content']}>
+            <Input
+              type="password"
+              placeholder="Password"
+              value={password}
+              onChange={onPasswordChange}
+              ref={passwordInputRef}
+              disabled={inputDisabled}
+            />
           </div>
-        </form>
-      </div>
-    </Modal>
+        </div>
+        <div className={css['form-footer']}>
+          <Button type="submit" disabled={inputDisabled} onClick={onSubmit}>
+            Log in
+          </Button>
+          <div className={css['modal-form-error']}>{errorMessage}</div>
+        </div>
+      </form>
+    </div>
   );
 }
 
-export default LoginModal;
+export default LoginForm;
diff --git a/web/modals/account/log-in-modal.react.js b/web/modals/account/log-in-modal.react.js
--- a/web/modals/account/log-in-modal.react.js
+++ b/web/modals/account/log-in-modal.react.js
@@ -1,156 +1,16 @@
 // @flow
 
-import invariant from 'invariant';
 import * as React from 'react';
 
-import { logInActionTypes, logIn } from 'lib/actions/user-actions';
-import { createLoadingStatusSelector } from 'lib/selectors/loading-selectors';
-import {
-  validEmailRegex,
-  oldValidUsernameRegex,
-} from 'lib/shared/account-utils';
-import type {
-  LogInExtraInfo,
-  LogInStartingPayload,
-} from 'lib/types/account-types';
-import {
-  useDispatchActionPromise,
-  useServerCall,
-} from 'lib/utils/action-utils';
-
-import Button from '../../components/button.react';
-import { useSelector } from '../../redux/redux-utils';
-import { webLogInExtraInfoSelector } from '../../selectors/account-selectors';
-import Input from '../input.react';
+import LoginForm from '../../account/log-in-form.react.js';
 import { useModalContext } from '../modal-provider.react';
 import Modal from '../modal.react';
-import css from './user-settings-modal.css';
 
-const loadingStatusSelector = createLoadingStatusSelector(logInActionTypes);
 function LoginModal(): React.Node {
-  const inputDisabled = useSelector(loadingStatusSelector) === 'loading';
-  const loginExtraInfo = useSelector(webLogInExtraInfoSelector);
-  const callLogIn = useServerCall(logIn);
-  const dispatchActionPromise = useDispatchActionPromise();
   const modalContext = useModalContext();
-
-  const [username, setUsername] = React.useState<string>('');
-  const [password, setPassword] = React.useState<string>('');
-  const [errorMessage, setErrorMessage] = React.useState<string>('');
-
-  const usernameInputRef = React.useRef();
-  const passwordInputRef = React.useRef();
-
-  React.useEffect(() => {
-    usernameInputRef.current?.focus();
-  }, []);
-
-  const onUsernameChange = React.useCallback(e => {
-    invariant(e.target instanceof HTMLInputElement, 'target not input');
-    setUsername(e.target.value);
-  }, []);
-
-  const onPasswordChange = React.useCallback(e => {
-    invariant(e.target instanceof HTMLInputElement, 'target not input');
-    setPassword(e.target.value);
-  }, []);
-
-  const logInAction = React.useCallback(
-    async (extraInfo: LogInExtraInfo) => {
-      try {
-        const result = await callLogIn({
-          username,
-          password,
-          ...extraInfo,
-        });
-        modalContext.clearModal();
-        return result;
-      } catch (e) {
-        if (e.message === 'invalid_parameters') {
-          setUsername('');
-          setErrorMessage(`user doesn't exist`);
-          usernameInputRef.current?.focus();
-        } else if (e.message === 'invalid_credentials') {
-          setPassword('');
-          setErrorMessage('wrong password');
-          passwordInputRef.current?.focus();
-        } else {
-          setUsername('');
-          setPassword('');
-          setErrorMessage('unknown error');
-          usernameInputRef.current?.focus();
-        }
-        throw e;
-      }
-    },
-    [callLogIn, modalContext, password, 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;
-      }
-
-      const extraInfo = loginExtraInfo();
-      dispatchActionPromise(
-        logInActionTypes,
-        logInAction(extraInfo),
-        undefined,
-        ({ calendarQuery: extraInfo.calendarQuery }: LogInStartingPayload),
-      );
-    },
-    [dispatchActionPromise, logInAction, loginExtraInfo, username],
-  );
-
   return (
     <Modal name="Log in" onClose={modalContext.clearModal}>
-      <div className={css['modal-body']}>
-        <form method="POST">
-          <div>
-            <div className={css['form-title']}>Username</div>
-            <div className={css['form-content']}>
-              <Input
-                type="text"
-                placeholder="Username"
-                value={username}
-                onChange={onUsernameChange}
-                ref={usernameInputRef}
-                disabled={inputDisabled}
-              />
-            </div>
-          </div>
-          <div>
-            <div className={css['form-title']}>Password</div>
-            <div className={css['form-content']}>
-              <Input
-                type="password"
-                placeholder="Password"
-                value={password}
-                onChange={onPasswordChange}
-                ref={passwordInputRef}
-                disabled={inputDisabled}
-              />
-            </div>
-          </div>
-          <div className={css['form-footer']}>
-            <Button type="submit" disabled={inputDisabled} onClick={onSubmit}>
-              Log in
-            </Button>
-            <div className={css['modal-form-error']}>{errorMessage}</div>
-          </div>
-        </form>
-      </div>
+      <LoginForm />
     </Modal>
   );
 }