diff --git a/src/components/structures/login/Login.js b/src/components/structures/login/Login.js
index c31bdb1cca..44363d83ad 100644
--- a/src/components/structures/login/Login.js
+++ b/src/components/structures/login/Login.js
@@ -373,15 +373,22 @@ module.exports = React.createClass({
             }
         }
 
+        let errorTextSection;
+        if (this.state.errorText) {
+            errorTextSection = (
+                <div className="mx_Login_error">
+                    { this.state.errorText }
+                </div>
+            );
+        }
+
         return (
             <LoginPage>
                 <div className="mx_Login_box">
                     <LoginHeader />
                     <div>
                         { header }
-                        <div className="mx_Login_error">
-                            { this.state.errorText }
-                        </div>
+                        { errorTextSection }
                         { this.componentForStep(this.state.currentFlow) }
                         { serverConfig }
                         <a className="mx_Login_create" onClick={this.props.onRegisterClick} href="#">
diff --git a/src/components/structures/login/Registration.js b/src/components/structures/login/Registration.js
index 15e6b536c4..4e95b62be3 100644
--- a/src/components/structures/login/Registration.js
+++ b/src/components/structures/login/Registration.js
@@ -397,7 +397,9 @@ module.exports = React.createClass({
         }
         else {
             header = <h2>{ _t('Create an account') }</h2>;
-            errorText = <div className="mx_Login_error">{ this.state.errorText }</div>;
+            if (this.state.errorText) {
+                errorText = <div className="mx_Login_error">{ this.state.errorText }</div>;
+            }
         }
 
         return (