diff --git a/web/react/components/user_settings/user_settings_security.jsx b/web/react/components/user_settings/user_settings_security.jsx
index 0c9e722de4..5693047c27 100644
--- a/web/react/components/user_settings/user_settings_security.jsx
+++ b/web/react/components/user_settings/user_settings_security.jsx
@@ -88,7 +88,8 @@ class SecurityTab extends React.Component {
         }
 
         if (newPassword !== confirmPassword) {
-            this.setState({passwordError: formatMessage(holders.passwordMatchError), serverError: ''});
+            var defaultState = Object.assign(this.getDefaultState(), {passwordError: formatMessage(holders.passwordMatchError), serverError: ''});
+            this.setState(defaultState);
             return;
         }