diff --git a/src/components/structures/auth/Login.js b/src/components/structures/auth/Login.js
index 27378447d5..31cb92d982 100644
--- a/src/components/structures/auth/Login.js
+++ b/src/components/structures/auth/Login.js
@@ -217,7 +217,9 @@ module.exports = React.createClass({
                     </div>
                 );
             } else if (error.httpStatus === 401 || error.httpStatus === 403) {
-                if (SdkConfig.get()['disable_custom_urls']) {
+                if (error.errcode === 'M_USER_DEACTIVATED') {
+                    errorText = _t('This account has been deactivated.');
+                } else if (SdkConfig.get()['disable_custom_urls']) {
                     errorText = (
                         <div>
                             <div>{ _t('Incorrect username and/or password.') }</div>
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index c5ef2fd989..9ad20bf56c 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1574,6 +1574,7 @@
     "General failure": "General failure",
     "This homeserver does not support login using email address.": "This homeserver does not support login using email address.",
     "Please <a>contact your service administrator</a> to continue using this service.": "Please <a>contact your service administrator</a> to continue using this service.",
+    "This account has been deactivated.": "This account has been deactivated.",
     "Incorrect username and/or password.": "Incorrect username and/or password.",
     "Please note you are logging into the %(hs)s server, not matrix.org.": "Please note you are logging into the %(hs)s server, not matrix.org.",
     "Failed to perform homeserver discovery": "Failed to perform homeserver discovery",