diff --git a/src/components/structures/login/Login.js b/src/components/structures/login/Login.js
index 789b066074..fa1bd2e6b5 100644
--- a/src/components/structures/login/Login.js
+++ b/src/components/structures/login/Login.js
@@ -105,7 +105,17 @@ module.exports = React.createClass({
             if (error.httpStatus == 400 && usingEmail) {
                 errorText = _t('This Home Server does not support login using email address.');
             } else if (error.httpStatus === 401 || error.httpStatus === 403) {
-                errorText = _t('Incorrect username and/or password.');
+                const theme = UserSettingsStore.getTheme();
+                if (theme === "status") {
+                    errorText = (
+                        <div>
+                            <div>Incorrect username and/or password.</div>
+                            <div className="mx_Login_smallError">Please note you are logging into the matrix.status.im server, not matrix.org.</div>
+                        </div>
+                    );
+                } else {
+                    errorText = _t('Incorrect username and/or password.');   
+                }
             } else {
                 // other errors, not specific to doing a password login
                 errorText = this._errorTextFromError(error);
diff --git a/src/components/views/login/PasswordLogin.js b/src/components/views/login/PasswordLogin.js
index eb89bc00f1..8af148dc6c 100644
--- a/src/components/views/login/PasswordLogin.js
+++ b/src/components/views/login/PasswordLogin.js
@@ -122,6 +122,8 @@ class PasswordLogin extends React.Component {
             mx_Login_field_disabled: disabled,
         };
 
+        const theme = UserSettingsStore.getTheme();
+
         switch(loginType) {
             case PasswordLogin.LOGIN_FIELD_EMAIL:
                 classes.mx_Login_email = true;
@@ -144,7 +146,7 @@ class PasswordLogin extends React.Component {
                     type="text"
                     name="username" // make it a little easier for browser's remember-password
                     onChange={this.onUsernameChanged}
-                    placeholder={_t('User name')}
+                    placeholder={theme === 'status' ? "Username on matrix.status.im" : _t("User name")}
                     value={this.state.username}
                     autoFocus
                     disabled={disabled}