diff --git a/src/app/controllers/UserController.php b/src/app/controllers/UserController.php
index 301be6c..d4c818f 100644
--- a/src/app/controllers/UserController.php
+++ b/src/app/controllers/UserController.php
@@ -201,7 +201,11 @@ public function loginUser($data)
                 Util::redirect("/index.php");
             } else {
                 $this->loginfail($username);
-                return "Username/Password is wrong.";
+                if(!$this->doesthisuserexist($username))
+                {
+                    return "No user with this name was found.";
+                }
+                return "Username/Password combination is wrong.";
             }
         }
     }
diff --git a/src/app/models/UsersModel.php b/src/app/models/UsersModel.php
index de99799..f0a4ad1 100644
--- a/src/app/models/UsersModel.php
+++ b/src/app/models/UsersModel.php
@@ -251,7 +251,7 @@ protected function addrememberToken($token, $username)
         $this->statement->execute([$username, $token, $ip, $browser, $os, $time, "none"]);
     }
 
-    protected function loginfail($username)
+    protected function doesthisuserexist($username)
     {
         $this->prepare('SELECT * FROM `users` WHERE `username` = ?');
         $this->statement->execute([$username]);
@@ -260,6 +260,14 @@ protected function loginfail($username)
         if (!$row) {
             return false; 
         }
+        else return true;
+    }
+
+    protected function loginfail($username)
+    {
+        if (!$this->doesthisuserexist($username)) {
+            return false; 
+        }
         else {
             $this->prepare('UPDATE `users` SET `loginfails` = `loginfails` + 1 WHERE `username` = ?');
             $this->statement->execute([$username]);