diff --git a/application/Espo/Core/Authentication/Helpers/UserFinder.php b/application/Espo/Core/Authentication/Helper/UserFinder.php
similarity index 90%
rename from application/Espo/Core/Authentication/Helpers/UserFinder.php
rename to application/Espo/Core/Authentication/Helper/UserFinder.php
index 3f4fdd56d1..f29f25ef9e 100644
--- a/application/Espo/Core/Authentication/Helpers/UserFinder.php
+++ b/application/Espo/Core/Authentication/Helper/UserFinder.php
@@ -27,17 +27,15 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core\Authentication\Helpers;
+namespace Espo\Core\Authentication\Helper;
 
-use Espo\Core\{
-    ORM\EntityManager,
-};
+use Espo\ORM\EntityManager;
 
 use Espo\Entities\User;
 
 class UserFinder
 {
-    protected $entityManager;
+    private $entityManager;
 
     public function __construct(EntityManager $entityManager)
     {
@@ -47,7 +45,7 @@ class UserFinder
     public function find(string $username, string $hash): ?User
     {
         $user = $this->entityManager
-            ->getRepository('User')
+            ->getRDBRepository(User::ENTITY_TYPE)
             ->where([
                 'userName' => $username,
                 'password' => $hash,
@@ -61,7 +59,7 @@ class UserFinder
     public function findApiHmac(string $apiKey): ?User
     {
         $user = $this->entityManager
-            ->getRepository('User')
+            ->getRDBRepository(User::ENTITY_TYPE)
             ->where([
                 'type' => 'api',
                 'apiKey' => $apiKey,
@@ -75,7 +73,7 @@ class UserFinder
     public function findApiApiKey(string $apiKey): ?User
     {
         $user = $this->entityManager
-            ->getRepository('User')
+            ->getRDBRepository(User::ENTITY_TYPE)
             ->where([
                 'type' => 'api',
                 'apiKey' => $apiKey,
diff --git a/application/Espo/Core/Authentication/Logins/ApiKey.php b/application/Espo/Core/Authentication/Logins/ApiKey.php
index 96cd6e62e9..262fcbad93 100644
--- a/application/Espo/Core/Authentication/Logins/ApiKey.php
+++ b/application/Espo/Core/Authentication/Logins/ApiKey.php
@@ -34,7 +34,7 @@ use Espo\Core\{
     Authentication\Login,
     Authentication\Login\Data,
     Authentication\Result,
-    Authentication\Helpers\UserFinder,
+    Authentication\Helper\UserFinder,
     Authentication\Result\FailReason,
 };
 
diff --git a/application/Espo/Core/Authentication/Logins/Espo.php b/application/Espo/Core/Authentication/Logins/Espo.php
index f8042df1ef..657e854161 100644
--- a/application/Espo/Core/Authentication/Logins/Espo.php
+++ b/application/Espo/Core/Authentication/Logins/Espo.php
@@ -35,7 +35,7 @@ use Espo\Core\{
     Authentication\Login,
     Authentication\Login\Data,
     Authentication\Result,
-    Authentication\Helpers\UserFinder,
+    Authentication\Helper\UserFinder,
     Authentication\Result\FailReason,
 };
 
diff --git a/application/Espo/Core/Authentication/Logins/Hmac.php b/application/Espo/Core/Authentication/Logins/Hmac.php
index bd5b0e18dd..66f29bc6ab 100644
--- a/application/Espo/Core/Authentication/Logins/Hmac.php
+++ b/application/Espo/Core/Authentication/Logins/Hmac.php
@@ -35,7 +35,7 @@ use Espo\Core\{
     Authentication\Login,
     Authentication\Login\Data,
     Authentication\Result,
-    Authentication\Helpers\UserFinder,
+    Authentication\Helper\UserFinder,
     Exceptions\Error,
     Authentication\Result\FailReason,
 };