diff --git a/Changelog b/Changelog
index 1986cd470..7f0de565e 100755
--- a/Changelog
+++ b/Changelog
@@ -1,4 +1,5 @@
 2018-02-02 DariusIII
+	* Fix: Fix getByIdAndRssToken function
 	* Chg: Use replace getById user lookup with User model find built in function(does the same thing as custom function)
 2018-02-01 DariusIII
 	* Chg: Update sebastian/comparator to latest version
diff --git a/app/Models/User.php b/app/Models/User.php
index 574fd5ca1..caa6b678e 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -529,28 +529,12 @@ class User extends Authenticatable
      */
     public static function getByIdAndRssToken($userID, $rssToken)
     {
-        $user = self::query()->where('id', '=', $userID, true)->where('rsstoken', '=', $rssToken)->get();
+        $user = self::query()->where(['id' => $userID, 'rsstoken' => $rssToken])->first();
         if ($user === null) {
             return false;
         }
 
-        return $user;
-    }
-
-    /**
-     * @param $id
-     *
-     * @return array|bool
-     */
-    public static function getById($id)
-    {
-        $result = self::find($id);
-
-        if ($result === null) {
-            return false;
-        }
-
-        return $result;
+        return $user->toArray();
     }
 
     /**