diff --git a/web/settings/password-change-modal.js b/web/settings/password-change-modal.js
--- a/web/settings/password-change-modal.js
+++ b/web/settings/password-change-modal.js
@@ -65,51 +65,6 @@
   }
 
   render() {
-    const { inputDisabled } = this.props;
-    const mainContent = (
-      <div>
-        <div className={css['form-text']}>
-          <div className={css['form-title']}>Username</div>
-          <div className={css['form-content']}>{this.username}</div>
-        </div>
-        <div>
-          <div className={css['form-title']}>New password</div>
-          <div className={css['form-content']}>
-            <div>
-              <Input
-                type="password"
-                placeholder="New password"
-                value={this.state.newPassword}
-                onChange={this.onChangeNewPassword}
-                ref={this.newPasswordInputRef}
-                disabled={inputDisabled}
-              />
-            </div>
-            <div>
-              <Input
-                type="password"
-                placeholder="Confirm new password"
-                value={this.state.confirmNewPassword}
-                onChange={this.onChangeConfirmNewPassword}
-                disabled={inputDisabled}
-              />
-            </div>
-          </div>
-        </div>
-      </div>
-    );
-
-    const buttons = (
-      <Button
-        type="submit"
-        variant="primary"
-        onClick={this.onSubmit}
-        disabled={inputDisabled}
-      >
-        Update Account
-      </Button>
-    );
-
     let errorMsg;
     if (this.state.errorMessage) {
       errorMsg = (
@@ -117,31 +72,68 @@
       );
     }
 
+    const { inputDisabled } = this.props;
     return (
       <Modal name="Edit account" onClose={this.props.clearModal} size="large">
         <div className={css['modal-body']}>
           <form method="POST">
-            {mainContent}
-            <div className={css['user-settings-current-password']}>
-              <p className={css['confirm-account-password']}>
-                Please enter your current password to confirm your identity
-              </p>
-              <div className={css['form-title']}>Current password</div>
-              <div className={css['form-content']}>
-                <Input
-                  type="password"
-                  placeholder="Current password"
-                  value={this.state.currentPassword}
-                  onChange={this.onChangeCurrentPassword}
+            <div>
+              <div className={css['form-text']}>
+                <div className={css['form-title']}>Username</div>
+                <div className={css['form-content']}>{this.username}</div>
+              </div>
+              <div>
+                <div className={css['form-title']}>New password</div>
+                <div className={css['form-content']}>
+                  <div>
+                    <Input
+                      type="password"
+                      placeholder="New password"
+                      value={this.state.newPassword}
+                      onChange={this.onChangeNewPassword}
+                      ref={this.newPasswordInputRef}
+                      disabled={inputDisabled}
+                    />
+                  </div>
+                  <div>
+                    <Input
+                      type="password"
+                      placeholder="Confirm new password"
+                      value={this.state.confirmNewPassword}
+                      onChange={this.onChangeConfirmNewPassword}
+                      disabled={inputDisabled}
+                    />
+                  </div>
+                </div>
+              </div>
+              <div className={css['user-settings-current-password']}>
+                <p className={css['confirm-account-password']}>
+                  Please enter your current password to confirm your identity
+                </p>
+                <div className={css['form-title']}>Current password</div>
+                <div className={css['form-content']}>
+                  <Input
+                    type="password"
+                    placeholder="Current password"
+                    value={this.state.currentPassword}
+                    onChange={this.onChangeCurrentPassword}
+                    disabled={inputDisabled}
+                    ref={this.currentPasswordInputRef}
+                  />
+                </div>
+              </div>
+              <div className={css['form-footer']}>
+                <Button
+                  type="submit"
+                  variant="primary"
+                  onClick={this.onSubmit}
                   disabled={inputDisabled}
-                  ref={this.currentPasswordInputRef}
-                />
+                >
+                  Update Account
+                </Button>
+                {errorMsg}
               </div>
             </div>
-            <div className={css['form-footer']}>
-              {buttons}
-              {errorMsg}
-            </div>
           </form>
         </div>
       </Modal>