diff --git a/src/components/structures/InteractiveAuth.js b/src/components/structures/InteractiveAuth.js
index 71fee883be..a58ad9aaa4 100644
--- a/src/components/structures/InteractiveAuth.js
+++ b/src/components/structures/InteractiveAuth.js
@@ -107,7 +107,6 @@ export default React.createClass({
                 return;
             }
 
-            const msg = error.message || error.toString();
             this.setState({
                 errorText: msg
             });
diff --git a/src/components/structures/login/Registration.js b/src/components/structures/login/Registration.js
index f4805ef044..a878657de9 100644
--- a/src/components/structures/login/Registration.js
+++ b/src/components/structures/login/Registration.js
@@ -155,10 +155,21 @@ module.exports = React.createClass({
 
     _onUIAuthFinished: function(success, response, extra) {
         if (!success) {
+            let msg = response.message || response.toString();
+            // can we give a better error message?
+            if (response.required_stages && response.required_stages.indexOf('m.login.msisdn') > -1) {
+                let msisdn_available = false;
+                for (const flow of response.available_flows) {
+                    msisdn_available |= flow.stages.indexOf('m.login.msisdn') > -1;
+                }
+                if (!msisdn_available) {
+                    msg = "This server does not support authentication with a phone number";
+                }
+            }
             this.setState({
                 busy: false,
                 doingUIAuth: false,
-                errorText: response.message || response.toString(),
+                errorText: msg,
             });
             return;
         }