Update MFA help text and fix some minor bugs (#2903)

2 files changed, 4 insertions, 4 deletions

diff --git a/webapp/components/login/components/login_mfa.jsx b/webapp/components/login/components/login_mfa.jsx
index f8d42012c..ce77c9fa9 100644
--- a/webapp/components/login/components/login_mfa.jsx
+++ b/webapp/components/login/components/login_mfa.jsx
@@ -21,7 +21,7 @@ export default class LoginMfa extends React.Component {
         e.preventDefault();
         const state = {};
 
-        const token = this.refs.token.value.trim();
+        const token = this.refs.token.value.trim().replace(/\s/g, '');
         if (!token) {
             state.serverError = Utils.localizeMessage('login_mfa.tokenReq', 'Please enter an MFA token');
             this.setState(state);
diff --git a/webapp/components/login/login.jsx b/webapp/components/login/login.jsx
index ce200ad75..d2ee1be81 100644
--- a/webapp/components/login/login.jsx
+++ b/webapp/components/login/login.jsx
@@ -105,13 +105,12 @@ export default class Login extends React.Component {
     }
 
     submit(loginId, password, token) {
-        this.setState({showMfa: false, serverError: null});
-
         Client.webLogin(
             loginId,
             password,
             token,
             () => {
+                this.setState({serverError: null});
                 this.finishSignin();
             },
             (err) => {
@@ -122,6 +121,7 @@ export default class Login extends React.Component {
                     err.id === 'ent.ldap.do_login.user_not_registered.app_error' ||
                     err.id === 'ent.ldap.do_login.user_filtered.app_error') {
                     this.setState({
+                        showMfa: false,
                         serverError: (
                             <FormattedMessage
                                 id='login.userNotFound'
@@ -130,7 +130,7 @@ export default class Login extends React.Component {
                         )
                     });
                 } else {
-                    this.setState({serverError: err.message});
+                    this.setState({showMfa: false, serverError: err.message});
                 }
             }
         );