diff --git a/api/user.go b/api/user.go
index 84906eece3..bb2f1c794c 100644
--- a/api/user.go
+++ b/api/user.go
@@ -472,7 +472,11 @@ func login(c *Context, w http.ResponseWriter, r *http.Request) {
 	if user, err = authenticateUser(user, password, mfaToken); err != nil {
 		c.LogAuditWithUserId(user.Id, "failure")
 		//c.Err = model.NewLocAppError("login", "api.user.login.invalid_credentials", nil, err.Error())
-		c.Err = model.NewLocAppError("login", "api.user.login.invalid_credentials", nil, "")
+		if err.Id == "api.user.login.not_verified.app_error" {
+			c.Err = err
+		} else {
+			c.Err = model.NewLocAppError("login", "api.user.login.invalid_credentials", nil, "")
+		}
 		return
 	}
 
diff --git a/i18n/en.json b/i18n/en.json
index 04305774a6..19c97bc953 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -1781,7 +1781,7 @@
   },
   {
     "id": "api.user.login.invalid_credentials",
-    "translation": "User ID or password incorrect."
+    "translation": "Your login credentials are incorrect."
   },
   {
     "id": "api.user.login.not_provided.app_error",