diff --git a/src/components/structures/login/Login.js b/src/components/structures/login/Login.js
index d9a7039686..315a0ea242 100644
--- a/src/components/structures/login/Login.js
+++ b/src/components/structures/login/Login.js
@@ -230,6 +230,12 @@ module.exports = React.createClass({
         switch (step) {
             case 'm.login.password':
                 const PasswordLogin = sdk.getComponent('login.PasswordLogin');
+                // HSs that are not matrix.org may not be configured to have their
+                // domain name === domain part.
+                let hsDomain = url.parse(this.state.enteredHomeserverUrl).hostname;
+                if (hsDomain !== 'matrix.org') {
+                    hsDomain = null;
+                }
                 return (
                     <PasswordLogin
                         onSubmit={this.onPasswordLogin}
@@ -241,7 +247,7 @@ module.exports = React.createClass({
                         onPhoneNumberChanged={this.onPhoneNumberChanged}
                         onForgotPasswordClick={this.props.onForgotPasswordClick}
                         loginIncorrect={this.state.loginIncorrect}
-                        hsDomain={url.parse(this.state.enteredHomeserverUrl).hostname}
+                        hsDomain={hsDomain}
                     />
                 );
             case 'm.login.cas':
diff --git a/src/components/views/login/PasswordLogin.js b/src/components/views/login/PasswordLogin.js
index ffb86636ca..568461817c 100644
--- a/src/components/views/login/PasswordLogin.js
+++ b/src/components/views/login/PasswordLogin.js
@@ -118,10 +118,21 @@ class PasswordLogin extends React.Component {
                     autoFocus
                 />;
             case PasswordLogin.LOGIN_FIELD_MXID:
+                const mxidInputClasses = classNames({
+                    "mx_Login_field": true,
+                    "mx_Login_username": true,
+                    "mx_Login_field_has_suffix": Boolean(this.props.hsDomain),
+                });
+                let suffix = null;
+                if (this.props.hsDomain) {
+                    suffix = <div className="mx_Login_username_suffix">
+                        :{this.props.hsDomain}
+                    </div>;
+                }
                 return <div className="mx_Login_username_group">
                     <div className="mx_Login_username_prefix">@</div>
                     <input
-                        className="mx_Login_field mx_Login_username"
+                        className={mxidInputClasses}
                         key="username_input"
                         type="text"
                         name="username" // make it a little easier for browser's remember-password
@@ -130,7 +141,7 @@ class PasswordLogin extends React.Component {
                         value={this.state.username}
                         autoFocus
                     />
-                    <div className="mx_Login_username_suffix">:{this.props.hsDomain}</div>
+                    {suffix}
                 </div>;
             case PasswordLogin.LOGIN_FIELD_PHONE:
                 const CountryDropdown = sdk.getComponent('views.login.CountryDropdown');