diff --git a/web/account/log-in-form.react.js b/web/account/log-in-form.react.js
index 46e3fd8c3..a958333fc 100644
--- a/web/account/log-in-form.react.js
+++ b/web/account/log-in-form.react.js
@@ -1,179 +1,196 @@
 // @flow
 
+import { useConnectModal } from '@rainbow-me/rainbowkit';
 import invariant from 'invariant';
 import * as React from 'react';
+import { useSigner } from 'wagmi';
 
 import { logInActionTypes, logIn } from 'lib/actions/user-actions';
 import { useModalContext } from 'lib/components/modal-provider.react';
 import { createLoadingStatusSelector } from 'lib/selectors/loading-selectors';
 import {
   oldValidUsernameRegex,
   validEmailRegex,
 } from 'lib/shared/account-utils';
 import {
   type LogInExtraInfo,
   type LogInStartingPayload,
   logInActionSources,
 } from 'lib/types/account-types';
 import {
   useDispatchActionPromise,
   useServerCall,
 } from 'lib/utils/action-utils';
 import { isDev } from 'lib/utils/dev-utils';
 
 import Button from '../components/button.react';
 import LoadingIndicator from '../loading-indicator.react';
 import Input from '../modals/input.react';
 import { useSelector } from '../redux/redux-utils';
 import { webLogInExtraInfoSelector } from '../selectors/account-selectors';
 import css from './log-in-form.css';
 import PasswordInput from './password-input.react';
+import SIWEButton from './siwe-button.react.js';
 import SIWE from './siwe.react.js';
 
 const loadingStatusSelector = createLoadingStatusSelector(logInActionTypes);
 function LoginForm(): React.Node {
+  const { openConnectModal } = useConnectModal();
+  const { data: signer } = useSigner();
   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 [
+    siweAuthFlowSelected,
+    setSIWEAuthFlowSelected,
+  ] = React.useState<boolean>(false);
 
   const usernameInputRef = 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 onUsernameBlur = React.useCallback(() => {
     setUsername(untrimmedUsername => untrimmedUsername.trim());
   }, []);
 
   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({
           ...extraInfo,
           username,
           password,
           logInActionSource: logInActionSources.logInFromWebForm,
         });
         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, 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;
       } 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 'Log in';
   }, [inputDisabled]);
 
+  const onSIWEButtonClick = React.useCallback(() => {
+    setSIWEAuthFlowSelected(true);
+    openConnectModal && openConnectModal();
+  }, [openConnectModal]);
+
   let siwe;
-  if (isDev) {
+  if (isDev && siweAuthFlowSelected && signer) {
     siwe = <SIWE />;
+  } else if (isDev) {
+    siwe = <SIWEButton onSIWEButtonClick={onSIWEButtonClick} />;
   }
 
   return (
     <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}
               onBlur={onUsernameBlur}
               ref={usernameInputRef}
               disabled={inputDisabled}
             />
           </div>
         </div>
         <div>
           <div className={css.form_title}>Password</div>
           <div className={css.form_content}>
             <PasswordInput
               value={password}
               onChange={onPasswordChange}
               disabled={inputDisabled}
             />
           </div>
         </div>
         <div className={css.form_footer}>
           <Button
             variant="filled"
             type="submit"
             disabled={inputDisabled}
             onClick={onSubmit}
           >
             {loginButtonContent}
           </Button>
+          <hr />
           {siwe}
           <div className={css.modal_form_error}>{errorMessage}</div>
         </div>
       </form>
     </div>
   );
 }
 
 export default LoginForm;
diff --git a/web/account/siwe.react.js b/web/account/siwe.react.js
index ca5276242..a1b8053c4 100644
--- a/web/account/siwe.react.js
+++ b/web/account/siwe.react.js
@@ -1,174 +1,149 @@
 // @flow
 
 import '@rainbow-me/rainbowkit/dist/index.css';
 
 import olm from '@matrix-org/olm';
-import { ConnectButton, useConnectModal } from '@rainbow-me/rainbowkit';
+import { ConnectButton } from '@rainbow-me/rainbowkit';
 import invariant from 'invariant';
 import * as React from 'react';
 import { useDispatch } from 'react-redux';
 import { useAccount, useSigner } from 'wagmi';
 
 import {
   getSIWENonce,
   getSIWENonceActionTypes,
   siweAuth,
   siweAuthActionTypes,
 } from 'lib/actions/siwe-actions';
 import { createLoadingStatusSelector } from 'lib/selectors/loading-selectors';
 import type { LogInStartingPayload } from 'lib/types/account-types.js';
 import {
   useDispatchActionPromise,
   useServerCall,
 } from 'lib/utils/action-utils';
 import {
   createSIWEMessage,
   getSIWEStatementForPublicKey,
   siweMessageSigningExplanationStatements,
 } from 'lib/utils/siwe-utils.js';
 
 import Button from '../components/button.react';
 import LoadingIndicator from '../loading-indicator.react';
 import { setPrimaryIdentityPublicKey } from '../redux/primary-identity-public-key-reducer';
 import { useSelector } from '../redux/redux-utils';
 import { webLogInExtraInfoSelector } from '../selectors/account-selectors.js';
-import SIWEButton from './siwe-button.react.js';
 import css from './siwe.css';
 
 const getSIWENonceLoadingStatusSelector = createLoadingStatusSelector(
   getSIWENonceActionTypes,
 );
 function SIWE(): React.Node {
-  const { openConnectModal } = useConnectModal();
   const { address } = useAccount();
   const { data: signer } = useSigner();
   const dispatch = useDispatch();
   const dispatchActionPromise = useDispatchActionPromise();
   const getSIWENonceCall = useServerCall(getSIWENonce);
   const getSIWENonceCallLoadingStatus = useSelector(
     getSIWENonceLoadingStatusSelector,
   );
   const siweAuthCall = useServerCall(siweAuth);
   const logInExtraInfo = useSelector(webLogInExtraInfoSelector);
 
   const [siweNonce, setSIWENonce] = React.useState<?string>(null);
-  const [
-    hasSIWEButtonBeenClicked,
-    setHasSIWEButtonBeenClicked,
-  ] = React.useState<boolean>(false);
 
   const siweNonceShouldBeFetched =
-    !siweNonce &&
-    getSIWENonceCallLoadingStatus !== 'loading' &&
-    (signer || hasSIWEButtonBeenClicked);
+    !siweNonce && getSIWENonceCallLoadingStatus !== 'loading';
 
   React.useEffect(() => {
     if (!siweNonceShouldBeFetched) {
       return;
     }
     dispatchActionPromise(
       getSIWENonceActionTypes,
       (async () => {
         const response = await getSIWENonceCall();
         setSIWENonce(response);
       })(),
     );
   }, [dispatchActionPromise, getSIWENonceCall, siweNonceShouldBeFetched]);
 
   const primaryIdentityPublicKey = useSelector(
     state => state.primaryIdentityPublicKey,
   );
   React.useEffect(() => {
     (async () => {
       await olm.init();
       const account = new olm.Account();
       account.create();
       const { ed25519 } = JSON.parse(account.identity_keys());
       dispatch({
         type: setPrimaryIdentityPublicKey,
         payload: ed25519,
       });
     })();
   }, [dispatch]);
 
   const callSIWEAuthEndpoint = React.useCallback(
     (message: string, signature: string, extraInfo) =>
       siweAuthCall({
         message,
         signature,
         ...extraInfo,
       }),
     [siweAuthCall],
   );
 
   const attemptSIWEAuth = React.useCallback(
     (message: string, signature: string) => {
       const extraInfo = logInExtraInfo();
       dispatchActionPromise(
         siweAuthActionTypes,
         callSIWEAuthEndpoint(message, signature, extraInfo),
         undefined,
         ({ calendarQuery: extraInfo.calendarQuery }: LogInStartingPayload),
       );
     },
     [callSIWEAuthEndpoint, dispatchActionPromise, logInExtraInfo],
   );
 
   const onSignInButtonClick = React.useCallback(async () => {
+    invariant(signer, 'signer must be present during SIWE attempt');
     invariant(siweNonce, 'nonce must be present during SIWE attempt');
     invariant(
       primaryIdentityPublicKey,
       'primaryIdentityPublicKey must be present during SIWE attempt',
     );
     const statement = getSIWEStatementForPublicKey(primaryIdentityPublicKey);
     const message = createSIWEMessage(address, statement, siweNonce);
     const signature = await signer.signMessage(message);
     attemptSIWEAuth(message, signature);
   }, [address, attemptSIWEAuth, primaryIdentityPublicKey, signer, siweNonce]);
 
-  let siweLoginForm;
-  if (signer && (!siweNonce || !primaryIdentityPublicKey)) {
-    siweLoginForm = (
+  if (!siweNonce || !primaryIdentityPublicKey) {
+    return (
       <div className={css.connectButtonContainer}>
         <LoadingIndicator status="loading" size="medium" />
       </div>
     );
-  } else if (signer) {
-    siweLoginForm = (
-      <div className={css.siweLoginFormContainer}>
-        <div className={css.connectButtonContainer}>
-          <ConnectButton />
-        </div>
-        <p>{siweMessageSigningExplanationStatements[0]}</p>
-        <p>{siweMessageSigningExplanationStatements[1]}</p>
-        <p>
-          By signing up, you agree to our{' '}
-          <a href="https://comm.app/terms">Terms of Use</a> &{' '}
-          <a href="https://comm.app/privacy">Privacy Policy</a>.
-        </p>
-        <Button variant="filled" onClick={onSignInButtonClick}>
-          Sign in
-        </Button>
-      </div>
-    );
   }
 
-  const onSIWEButtonClick = React.useCallback(() => {
-    setHasSIWEButtonBeenClicked(true);
-    openConnectModal && openConnectModal();
-  }, [openConnectModal]);
-
-  let siweButton;
-  if (openConnectModal) {
-    siweButton = <SIWEButton onSIWEButtonClick={onSIWEButtonClick} />;
-  }
   return (
-    <div className={css.siweContainer}>
-      <hr />
-      {siweLoginForm}
-      {siweButton}
+    <div className={css.siweLoginFormContainer}>
+      <div className={css.connectButtonContainer}>
+        <ConnectButton />
+      </div>
+      <p>{siweMessageSigningExplanationStatements[0]}</p>
+      <p>{siweMessageSigningExplanationStatements[1]}</p>
+      <p>
+        By signing up, you agree to our{' '}
+        <a href="https://comm.app/terms">Terms of Use</a> &{' '}
+        <a href="https://comm.app/privacy">Privacy Policy</a>.
+      </p>
+      <Button variant="filled" onClick={onSignInButtonClick}>
+        Sign in
+      </Button>
     </div>
   );
 }
 
 export default SIWE;