diff --git a/app/screens/login/login.js b/app/screens/login/login.js
index d1b82604f..2b1c0daa9 100644
--- a/app/screens/login/login.js
+++ b/app/screens/login/login.js
@@ -24,6 +24,7 @@ import FormattedText from 'app/components/formatted_text';
 import StatusBar from 'app/components/status_bar';
 import PushNotifications from 'app/push_notifications';
 import {GlobalStyles} from 'app/styles';
+import {wrapWithPreventDoubleTap} from 'app/utils/tap';
 
 import logo from 'assets/images/logo.png';
 
@@ -65,6 +66,8 @@ class Login extends PureComponent {
     componentWillReceiveProps(nextProps) {
         if (this.props.loginRequest.status === RequestStatus.STARTED && nextProps.loginRequest.status === RequestStatus.SUCCESS) {
             this.props.actions.handleSuccessfulLogin().then(this.props.actions.getSession).then(this.goToLoadTeam);
+        } else if (this.props.loginRequest.status !== nextProps.loginRequest.status && nextProps.loginRequest.status !== RequestStatus.STARTED) {
+            this.setState({isLoading: false});
         }
     }
 
@@ -106,6 +109,9 @@ class Login extends PureComponent {
 
     goToMfa = () => {
         const {intl, navigator, theme} = this.props;
+
+        this.setState({isLoading: false});
+
         navigator.push({
             screen: 'MFA',
             title: intl.formatMessage({id: 'mobile.routes.mfa', defaultMessage: 'Multi-factor Authentication'}),
@@ -125,10 +131,10 @@ class Login extends PureComponent {
         this.passwd.blur();
     };
 
-    preSignIn = () => {
-        this.setState({error: null});
+    preSignIn = wrapWithPreventDoubleTap(() => {
+        this.setState({error: null, isLoading: true});
         Keyboard.dismiss();
-        InteractionManager.runAfterInteractions(() => {
+        InteractionManager.runAfterInteractions(async () => {
             if (!this.props.loginId) {
                 // it's slightly weird to be constructing the message ID, but it's a bit nicer than triply nested if statements
                 let msgId = 'login.no';
@@ -173,18 +179,17 @@ class Login extends PureComponent {
             }
 
             if (this.props.config.EnableMultifactorAuthentication === 'true') {
-                this.props.actions.checkMfa(this.props.loginId).then((result) => {
-                    if (result.data) {
-                        this.goToMfa();
-                    } else {
-                        this.signIn();
-                    }
-                });
+                const result = await this.props.actions.checkMfa(this.props.loginId);
+                if (result.data) {
+                    this.goToMfa();
+                } else {
+                    this.signIn();
+                }
             } else {
                 this.signIn();
             }
         });
-    };
+    });
 
     signIn = () => {
         const {actions, loginId, loginRequest, password} = this.props;
@@ -288,7 +293,7 @@ class Login extends PureComponent {
     };
 
     render() {
-        const isLoading = this.props.loginRequest.status === RequestStatus.STARTED;
+        const isLoading = this.props.loginRequest.status === RequestStatus.STARTED || this.state.isLoading;
 
         let proceed;
         if (isLoading) {
diff --git a/app/screens/mfa/mfa.js b/app/screens/mfa/mfa.js
index 6ba50d7a0..64334c7ae 100644
--- a/app/screens/mfa/mfa.js
+++ b/app/screens/mfa/mfa.js
@@ -19,10 +19,11 @@ import FormattedText from 'app/components/formatted_text';
 import StatusBar from 'app/components/status_bar';
 import TextInputWithLocalizedPlaceholder from 'app/components/text_input_with_localized_placeholder';
 import {GlobalStyles} from 'app/styles';
+import {wrapWithPreventDoubleTap} from 'app/utils/tap';
 
 import logo from 'assets/images/logo.png';
 
-import RequestStatus from 'mattermost-redux/constants/request_status';
+import {RequestStatus} from 'mattermost-redux/constants';
 
 export default class Mfa extends PureComponent {
     static propTypes = {
@@ -83,7 +84,7 @@ export default class Mfa extends PureComponent {
         this.textInput.refs.wrappedInstance.blur();
     };
 
-    submit = () => {
+    submit = wrapWithPreventDoubleTap(() => {
         Keyboard.dismiss();
         if (!this.state.token) {
             this.setState({
@@ -98,7 +99,7 @@ export default class Mfa extends PureComponent {
         }
 
         this.props.actions.login(this.props.loginId, this.props.password, this.state.token);
-    };
+    });
 
     render() {
         const isLoading = this.props.loginRequest.status === RequestStatus.STARTED;
diff --git a/app/screens/select_server/select_server.js b/app/screens/select_server/select_server.js
index 67f09694b..1c109da02 100644
--- a/app/screens/select_server/select_server.js
+++ b/app/screens/select_server/select_server.js
@@ -25,6 +25,7 @@ import ErrorText from 'app/components/error_text';
 import FormattedText from 'app/components/formatted_text';
 import TextInputWithLocalizedPlaceholder from 'app/components/text_input_with_localized_placeholder';
 import {GlobalStyles} from 'app/styles';
+import {wrapWithPreventDoubleTap} from 'app/utils/tap';
 import {isValidUrl, stripTrailingSlashes} from 'app/utils/url';
 import {UpgradeTypes} from 'app/constants/view';
 import checkUpgradeType from 'app/utils/client_upgrade';
@@ -163,7 +164,7 @@ class SelectServer extends PureComponent {
         this.blur();
     };
 
-    onClick = async () => {
+    onClick = wrapWithPreventDoubleTap(async () => {
         const preUrl = urlParse(this.props.serverUrl, true);
         const url = stripTrailingSlashes(preUrl.protocol + '//' + preUrl.host);
         let error = null;
@@ -185,7 +186,7 @@ class SelectServer extends PureComponent {
         }
 
         this.setState({error});
-    };
+    });
 
     inputRef = (ref) => {
         this.textInput = ref;