diff --git a/lib/SP/Repositories/AuthToken/AuthTokenRepository.php b/lib/SP/Repositories/AuthToken/AuthTokenRepository.php
index 0b95bab9..1a10f1cf 100644
--- a/lib/SP/Repositories/AuthToken/AuthTokenRepository.php
+++ b/lib/SP/Repositories/AuthToken/AuthTokenRepository.php
@@ -189,10 +189,11 @@ final class AuthTokenRepository extends Repository implements RepositoryItemInte
             INNER JOIN User ON AuthToken.userid = User.id');
 
         if ($itemSearchData->getSeachString() !== '') {
-            $queryData->setWhere('User.login LIKE ?');
+            $queryData->setWhere('User.login LIKE ? OR User.name LIKE ?');
 
             $search = '%' . $itemSearchData->getSeachString() . '%';
             $queryData->addParam($search);
+            $queryData->addParam($search);
         }
 
         $queryData->setOrder('User.login, AuthToken.actionId');
diff --git a/tests/SP/Repositories/AuthTokenRepositoryTest.php b/tests/SP/Repositories/AuthTokenRepositoryTest.php
index a99835c1..7df3196d 100644
--- a/tests/SP/Repositories/AuthTokenRepositoryTest.php
+++ b/tests/SP/Repositories/AuthTokenRepositoryTest.php
@@ -234,6 +234,7 @@ class AuthTokenRepositoryTest extends DatabaseTestCase
     public function testSearch()
     {
         $itemSearchData = new ItemSearchData();
+        $itemSearchData->setLimitCount(10);
         $itemSearchData->setSeachString('admin');
 
         $result = self::$repository->search($itemSearchData);
diff --git a/tests/SP/Services/AuthToken/AuthTokenServiceTest.php b/tests/SP/Services/AuthToken/AuthTokenServiceTest.php
index ef086031..cb6f330a 100644
--- a/tests/SP/Services/AuthToken/AuthTokenServiceTest.php
+++ b/tests/SP/Services/AuthToken/AuthTokenServiceTest.php
@@ -232,6 +232,7 @@ class AuthTokenServiceTest extends DatabaseTestCase
     public function testSearch()
     {
         $itemSearchData = new ItemSearchData();
+        $itemSearchData->setLimitCount(10);
         $itemSearchData->setSeachString('admin');
 
         $result = self::$service->search($itemSearchData);
diff --git a/tests/res/config/config.xml b/tests/res/config/config.xml
index 584393a6..70c8eda7 100644
--- a/tests/res/config/config.xml
+++ b/tests/res/config/config.xml
@@ -9,11 +9,11 @@
   <authBasicAutoLoginEnabled>1</authBasicAutoLoginEnabled>
   <authBasicDomain></authBasicDomain>
   <authBasicEnabled>1</authBasicEnabled>
-  <backup_hash>aceecb4ce45b094ed394427d60aed8d6a216d413</backup_hash>
+  <backup_hash>49cd7d086019611d6dd17dbdda9add80a86a843f</backup_hash>
   <checkUpdates>0</checkUpdates>
   <checknotices>0</checknotices>
-  <configDate>1538822436</configDate>
-  <configHash>551729e44bdcd0c436840f2a75e6ba54da458a96</configHash>
+  <configDate>1539216318</configDate>
+  <configHash>02b5d4010c10b8abda92c3d3fc982b30910c33e7</configHash>
   <configSaver></configSaver>
   <configVersion></configVersion>
   <databaseVersion></databaseVersion>
@@ -32,7 +32,7 @@
   <dokuwikiUrlBase></dokuwikiUrlBase>
   <dokuwikiUser></dokuwikiUser>
   <encryptSession>0</encryptSession>
-  <export_hash>ba290a3d6447a827eda305c0ac6f44985de47740</export_hash>
+  <export_hash>a17899853134d82a571f098b918d13c50df21923</export_hash>
   <filesAllowedExts>
     <item type="filesAllowedExts">PDF</item>
     <item type="filesAllowedExts">JPG</item>