diff --git a/webapp/components/user_settings/user_settings_security.jsx b/webapp/components/user_settings/user_settings_security.jsx
index ffeeb1a249..10ac9131b6 100644
--- a/webapp/components/user_settings/user_settings_security.jsx
+++ b/webapp/components/user_settings/user_settings_security.jsx
@@ -68,10 +68,11 @@ class SecurityTab extends React.Component {
             currentPassword: '',
             newPassword: '',
             confirmPassword: '',
+            passwordError: '',
+            serverError: '',
             authService: this.props.user.auth_service,
             mfaShowQr: false,
-            mfaToken: '',
-            serverError: ''
+            mfaToken: ''
         };
     }