diff --git a/src/controllers/templates/Login.js b/src/controllers/templates/Login.js
index c14ed28c4a..3472bf32ce 100644
--- a/src/controllers/templates/Login.js
+++ b/src/controllers/templates/Login.js
@@ -94,8 +94,14 @@ module.exports = {
             self.setStep("stage_m.login.password");
             if (error.httpStatus == 400 && loginParams.medium) {
                 self.setState({errorText: 'This Home Server does not support login using email address.'});
-            } else {
-                self.setState({errorText: 'Login failed.'});
+            }
+            else if (error.httpStatus === 403) {
+                self.setState({errorText: 'Incorrect username and/or password.'});
+            }
+            else {
+                self.setState({
+                    errorText: 'There was a problem logging in. (HTTP ' + error.httpStatus + ")"
+                });
             }
         });
     },