diff --git a/src/Skobkin/Bundle/PointToolsBundle/DataFixtures/ORM/LoadUserData.php b/src/Skobkin/Bundle/PointToolsBundle/DataFixtures/ORM/LoadUserData.php
index 3be48e4..58b2cdf 100644
--- a/src/Skobkin/Bundle/PointToolsBundle/DataFixtures/ORM/LoadUserData.php
+++ b/src/Skobkin/Bundle/PointToolsBundle/DataFixtures/ORM/LoadUserData.php
@@ -10,13 +10,15 @@ use Skobkin\Bundle\PointToolsBundle\Entity\User;
 class LoadUserData extends AbstractFixture implements OrderedFixtureInterface
 {
     public const USER_MAIN_ID = 99999;
-    public const USER_PRIV_ID = 99998;
-    public const USER_WLON_ID = 99997;
-    public const USER_PRWL_ID = 99996;
-    public const USER_UNNM_ID = 99995;
+    public const USER_SCND_ID = 99998;
+    public const USER_PRIV_ID = 99997;
+    public const USER_WLON_ID = 99996;
+    public const USER_PRWL_ID = 99995;
+    public const USER_UNNM_ID = 99994;
 
     private $users = [
         ['id' => self::USER_MAIN_ID, 'login' => 'testuser', 'name' => 'Test User 1', 'private' => false, 'whitelist-only' => false],
+        ['id' => self::USER_SCND_ID, 'login' => 'testuser2', 'name' => 'Test User 2 for autocomplete test', 'private' => false, 'whitelist-only' => false],
         ['id' => self::USER_PRIV_ID, 'login' => 'private_user', 'name' => 'Test User 3', 'private' => true, 'whitelist-only' => false],
         ['id' => self::USER_WLON_ID, 'login' => 'whitelist_only_user', 'name' => 'Test User 4', 'private' => false, 'whitelist-only' => true],
         ['id' => self::USER_PRWL_ID, 'login' => 'private_whitelist_only_user', 'name' => 'Test User 4', 'private' => false, 'whitelist-only' => true],
diff --git a/tests/Skobkin/PointToolsBundle/Controller/MainControllerTest.php b/tests/Skobkin/PointToolsBundle/Controller/MainControllerTest.php
index d1fb5a0..e6b409e 100644
--- a/tests/Skobkin/PointToolsBundle/Controller/MainControllerTest.php
+++ b/tests/Skobkin/PointToolsBundle/Controller/MainControllerTest.php
@@ -2,6 +2,8 @@
 
 namespace Tests\Skobkin\PointToolsBundle\Controller;
 
+use Skobkin\Bundle\PointToolsBundle\DataFixtures\ORM\LoadUserData;
+use Symfony\Bundle\FrameworkBundle\Client;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
 class MainControllerTest extends WebTestCase
@@ -75,14 +77,10 @@ class MainControllerTest extends WebTestCase
 
     /**
      * Tests AJAX user search autocomplete and returns JSON response string
-     *
-     * @return string
      */
-    public function testAjaxUserAutoComplete()
+    public function testAjaxUserAutoComplete(): string
     {
-        $client = static::createClient();
-        // We need to search all test user with 'testuser5' included which will test the code against null-string problem in User#getName()
-        $client->request('GET', '/ajax/users/search/testuser');
+        $client = $this->createClientForAjaxUserSearchByLogin('testuser');
 
         $this->assertTrue($client->getResponse()->headers->contains('Content-Type', 'application/json'), 'Response has "Content-Type" = "application/json"');
 
@@ -91,24 +89,20 @@ class MainControllerTest extends WebTestCase
 
     /**
      * @depends testAjaxUserAutoComplete
-     *
-     * @param $json
      */
-    public function testAjaxUserAutoCompleteHasOptions($json)
+    public function testAjaxUserAutoCompleteHasOptions(string $json): array
     {
         $data = json_decode($json);
 
         $this->assertNotNull($data, 'JSON data successfully decoded and not empty');
         $this->assertTrue(is_array($data), 'JSON data is array');
-        $this->assertCount(5, $data, 'Array has 5 elements');
+        $this->assertCount(2, $data, 'Array has 2 elements');
 
         return $data;
     }
 
     /**
      * @depends testAjaxUserAutoCompleteHasOptions
-     *
-     * @param array $users
      */
     public function testAjaxUserAutoCompleteHasValidUserObjects(array $users)
     {
@@ -118,7 +112,44 @@ class MainControllerTest extends WebTestCase
         }
     }
 
-    public function testAjaxUserAutoCompleteForNonExistingUser()
+    /**
+     * Tests AJAX user search autocomplete for unnamed user and returns JSON response string
+     */
+    public function testAjaxUserAutoCompleteForUnnamedUser(): string
+    {
+        $client = $this->createClientForAjaxUserSearchByLogin('unnamed_user');
+
+        $this->assertTrue($client->getResponse()->headers->contains('Content-Type', 'application/json'), 'Response has "Content-Type" = "application/json"');
+
+        return $client->getResponse()->getContent();
+    }
+
+    /**
+     * @depends testAjaxUserAutoComplete
+     */
+    public function testAjaxUserAutoCompleteHasOptionsForUnnamedUser(string $json): array
+    {
+        $data = json_decode($json);
+
+        $this->assertNotNull($data, 'JSON data successfully decoded and not empty');
+        $this->assertTrue(is_array($data), 'JSON data is array');
+        $this->assertCount(1, $data, 'Array has 1 elements');
+
+        return reset($data);
+    }
+
+    /**
+     * @depends testAjaxUserAutoCompleteHasOptions
+     */
+    public function testAjaxUserAutoCompleteHasValidUserObjectsForUnnamedUser(array $user)
+    {
+        $this->assertTrue(array_key_exists('login', $user), 'Result has \'login\' field');
+        $this->assertTrue(array_key_exists('name', $user), 'Result has \'name\' field');
+        $this->assertInternalType('string', $user['name'], 'User name is string');
+        $this->assertEquals('', $user['name'], 'User name is empty string');
+    }
+
+    public function testAjaxUserAutoCompleteIsEmptyForNonExistingUser()
     {
         $client = static::createClient();
         $client->request('GET', '/ajax/users/search/aksdjhaskdjhqwhdgqkjwhdgkjah');
@@ -131,4 +162,12 @@ class MainControllerTest extends WebTestCase
         $this->assertTrue(is_array($data), 'JSON data is array');
         $this->assertEquals(0, count($data), 'Array has no elements');
     }
+
+    private function createClientForAjaxUserSearchByLogin(string $login): Client
+    {
+        $client = static::createClient();
+        $client->request('GET', '/ajax/users/search/'.$login);
+
+        return $client;
+    }
 }