diff --git a/web/settings/account-delete-modal.react.js b/web/settings/account-delete-modal.react.js
index bac272b54..0de7be60a 100644
--- a/web/settings/account-delete-modal.react.js
+++ b/web/settings/account-delete-modal.react.js
@@ -1,186 +1,213 @@
 // @flow
 
 import invariant from 'invariant';
 import * as React from 'react';
 
 import {
   deleteAccount,
   deleteAccountActionTypes,
 } from 'lib/actions/user-actions';
 import { useModalContext } from 'lib/components/modal-provider.react';
 import { preRequestUserStateSelector } from 'lib/selectors/account-selectors';
 import { createLoadingStatusSelector } from 'lib/selectors/loading-selectors';
+import { accountHasPassword } from 'lib/shared/account-utils.js';
 import type { LogOutResult } from 'lib/types/account-types';
 import type { PreRequestUserState } from 'lib/types/session-types';
 import type { DispatchActionPromise } from 'lib/utils/action-utils';
 import {
   useDispatchActionPromise,
   useServerCall,
 } from 'lib/utils/action-utils';
 
 import Button, { buttonThemes } from '../components/button.react';
 import Input from '../modals/input.react';
 import Modal from '../modals/modal.react';
 import { useSelector } from '../redux/redux-utils';
 import SWMansionIcon from '../SWMansionIcon.react.js';
 import css from './account-delete-modal.css';
 
 type Props = {
+  +isAccountWithPassword: boolean,
   +preRequestUserState: PreRequestUserState,
   +inputDisabled: boolean,
   +dispatchActionPromise: DispatchActionPromise,
   +deleteAccount: (
-    password: string,
+    password: ?string,
     preRequestUserState: PreRequestUserState,
   ) => Promise<LogOutResult>,
   +popModal: () => void,
 };
 type State = {
-  +currentPassword: string,
+  +currentPassword: ?string,
   +errorMessage: string,
 };
 
 class AccountDeleteModal extends React.PureComponent<Props, State> {
   currentPasswordInput: ?HTMLInputElement;
 
   constructor(props: Props) {
     super(props);
     this.state = {
-      currentPassword: '',
+      currentPassword: props.isAccountWithPassword ? '' : null,
       errorMessage: '',
     };
   }
 
   componentDidMount() {
-    invariant(this.currentPasswordInput, 'newPasswordInput ref unset');
-    this.currentPasswordInput.focus();
+    invariant(
+      !this.props.isAccountWithPassword || this.currentPasswordInput,
+      'newPasswordInput ref unset',
+    );
+    this.currentPasswordInput?.focus();
   }
 
   render() {
     const { inputDisabled } = this.props;
 
     let errorMsg;
     if (this.state.errorMessage) {
       errorMsg = (
         <div className={css.form_error}>{this.state.errorMessage}</div>
       );
     }
 
+    let passwordConfirmation;
+    if (this.props.isAccountWithPassword) {
+      invariant(
+        this.state.currentPassword !== null &&
+          this.state.currentPassword !== undefined,
+        'currentPassword must be set if isAccountWithPassword',
+      );
+      passwordConfirmation = (
+        <>
+          <p className={css.confirm_password}>
+            Please enter your account password to confirm your identity.
+          </p>
+          <p className={css.form_title}>Account password</p>
+          <Input
+            type="password"
+            placeholder="Password"
+            value={this.state.currentPassword}
+            onChange={this.onChangeCurrentPassword}
+            disabled={inputDisabled}
+            ref={this.currentPasswordInputRef}
+          />
+        </>
+      );
+    }
+
     return (
       <Modal name="Delete Account" onClose={this.props.popModal} size="large">
         <div className={css.modal_body}>
           <form method="POST">
             <SWMansionIcon icon="warning-circle" size={22} />
             <p className={css.deletion_warning}>
               Your account will be permanently deleted. There is no way to
               reverse this.
             </p>
-            <p className={css.confirm_password}>
-              Please enter your account password to confirm your identity.
-            </p>
-            <p className={css.form_title}>Account password</p>
-            <Input
-              type="password"
-              placeholder="Password"
-              value={this.state.currentPassword}
-              onChange={this.onChangeCurrentPassword}
-              disabled={inputDisabled}
-              ref={this.currentPasswordInputRef}
-            />
+
+            {passwordConfirmation}
+
             <div className={css.form_footer}>
               <Button
                 variant="filled"
                 buttonColor={buttonThemes.danger}
                 type="submit"
                 onClick={this.onDelete}
                 disabled={
-                  inputDisabled || this.state.currentPassword.length === 0
+                  inputDisabled ||
+                  (this.props.isAccountWithPassword &&
+                    this.state.currentPassword?.length === 0)
                 }
               >
                 Delete Account
               </Button>
               {errorMsg}
             </div>
           </form>
         </div>
       </Modal>
     );
   }
 
   currentPasswordInputRef = (currentPasswordInput: ?HTMLInputElement) => {
     this.currentPasswordInput = currentPasswordInput;
   };
 
   onChangeCurrentPassword = (event: SyntheticEvent<HTMLInputElement>) => {
     const target = event.target;
     invariant(target instanceof HTMLInputElement, 'target not input');
     this.setState({ currentPassword: target.value });
   };
 
   onDelete = (event: SyntheticEvent<HTMLButtonElement>) => {
     event.preventDefault();
     this.props.dispatchActionPromise(
       deleteAccountActionTypes,
       this.deleteAction(),
     );
   };
 
   async deleteAction() {
     try {
       const response = await this.props.deleteAccount(
         this.state.currentPassword,
         this.props.preRequestUserState,
       );
       this.props.popModal();
       return response;
     } catch (e) {
       const errorMessage =
         e.message === 'invalid_credentials'
           ? 'wrong password'
           : 'unknown error';
       this.setState(
         {
-          currentPassword: '',
+          currentPassword: this.props.isAccountWithPassword ? '' : null,
           errorMessage: errorMessage,
         },
         () => {
           invariant(
-            this.currentPasswordInput,
+            !this.props.isAccountWithPassword || this.currentPasswordInput,
             'currentPasswordInput ref unset',
           );
-          this.currentPasswordInput.focus();
+          this.currentPasswordInput?.focus();
         },
       );
       throw e;
     }
   }
 }
 
 const deleteAccountLoadingStatusSelector = createLoadingStatusSelector(
   deleteAccountActionTypes,
 );
 
 const ConnectedAccountDeleteModal: React.ComponentType<{}> = React.memo<{}>(
   function ConnectedAccountDeleteModal(): React.Node {
+    const isAccountWithPassword = useSelector(state =>
+      accountHasPassword(state.currentUserInfo),
+    );
     const preRequestUserState = useSelector(preRequestUserStateSelector);
     const inputDisabled = useSelector(
       state => deleteAccountLoadingStatusSelector(state) === 'loading',
     );
     const callDeleteAccount = useServerCall(deleteAccount);
     const dispatchActionPromise = useDispatchActionPromise();
 
     const modalContext = useModalContext();
 
     return (
       <AccountDeleteModal
+        isAccountWithPassword={isAccountWithPassword}
         preRequestUserState={preRequestUserState}
         inputDisabled={inputDisabled}
         deleteAccount={callDeleteAccount}
         dispatchActionPromise={dispatchActionPromise}
         popModal={modalContext.popModal}
       />
     );
   },
 );
 
 export default ConnectedAccountDeleteModal;