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
@@ -115,7 +115,12 @@
                 type="submit"
                 variant="filled"
                 onClick={this.onSubmit}
-                disabled={inputDisabled}
+                disabled={
+                  inputDisabled ||
+                  this.state.currentPassword.length === 0 ||
+                  this.state.newPassword.length === 0 ||
+                  this.state.confirmNewPassword.length === 0
+                }
               >
                 Change Password
               </Button>