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
@@ -82,6 +82,17 @@
                 <span className={css['username-label']}>{'Logged in as '}</span>
                 <span className={css['username']}>{this.username}</span>
               </p>
+              <div className={css['form-content']}>
+                <Input
+                  type="password"
+                  placeholder="Current password"
+                  value={this.state.currentPassword}
+                  onChange={this.onChangeCurrentPassword}
+                  disabled={inputDisabled}
+                  ref={this.currentPasswordInputRef}
+                  label="Current password"
+                />
+              </div>
               <Input
                 type="password"
                 placeholder="New password"
@@ -99,17 +110,6 @@
                 disabled={inputDisabled}
               />
             </div>
-            <div className={css['form-content']}>
-              <Input
-                type="password"
-                placeholder="Current password"
-                value={this.state.currentPassword}
-                onChange={this.onChangeCurrentPassword}
-                disabled={inputDisabled}
-                ref={this.currentPasswordInputRef}
-                label="Current password"
-              />
-            </div>
             <div className={css['form-footer']}>
               <Button
                 type="submit"