diff --git a/DAL/Repositories/AdWebAppToWebAppRoleRepository.cs b/DAL/Repositories/AdWebAppToWebAppRoleRepository.cs
index 3797d02..663c241 100644
--- a/DAL/Repositories/AdWebAppToWebAppRoleRepository.cs
+++ b/DAL/Repositories/AdWebAppToWebAppRoleRepository.cs
@@ -5,7 +5,7 @@ namespace DAL.Repositories
 {
     public class AdWebAppToWebAppRoleRepository : BaseRepository<AdWebAppToWebAppRole>
     {
-        public AdWebAppToWebAppRoleRepository() : base(new WebApiContext())
+        public AdWebAppToWebAppRoleRepository(WebApiContext context) : base(context)
         {
         }
     }
diff --git a/DAL/Repositories/CostCentreRepository.cs b/DAL/Repositories/CostCentreRepository.cs
index 329856f..2ddd994 100644
--- a/DAL/Repositories/CostCentreRepository.cs
+++ b/DAL/Repositories/CostCentreRepository.cs
@@ -5,7 +5,7 @@ namespace DAL.Repositories
 {
     public class CostCentreRepository : BaseRepository<CostCentre>
     {
-        public CostCentreRepository() : base(new WebApiContext())
+        public CostCentreRepository(WebApiContext context) : base(context)
         {
         }
     }
diff --git a/DAL/Repositories/DepartmentRepository.cs b/DAL/Repositories/DepartmentRepository.cs
index 2db3a34..695e52c 100644
--- a/DAL/Repositories/DepartmentRepository.cs
+++ b/DAL/Repositories/DepartmentRepository.cs
@@ -10,7 +10,7 @@ namespace DAL.Repositories
 {
     public class DepartmentRepository : BaseRepository<Department>
     {
-        public DepartmentRepository() : base(new WebApiContext())
+        public DepartmentRepository(WebApiContext context) : base(context)
         {
         }
 
diff --git a/DAL/Repositories/DepartmentToWebAppToEmployeeForWindreamRepository.cs b/DAL/Repositories/DepartmentToWebAppToEmployeeForWindreamRepository.cs
index dca4313..1047bc7 100644
--- a/DAL/Repositories/DepartmentToWebAppToEmployeeForWindreamRepository.cs
+++ b/DAL/Repositories/DepartmentToWebAppToEmployeeForWindreamRepository.cs
@@ -10,7 +10,7 @@ namespace DAL.Repositories
 {
     public class DepartmentToWebAppToEmployeeForWindreamRepository : BaseRepository<DepartmentToWebAppToEmployeeForWindream>
     {
-        public DepartmentToWebAppToEmployeeForWindreamRepository() : base(new WebApiContext())
+        public DepartmentToWebAppToEmployeeForWindreamRepository(WebApiContext context) : base(context)
         {
         }
 
diff --git a/DAL/Repositories/DocumentArtRepository.cs b/DAL/Repositories/DocumentArtRepository.cs
index 7f4d27f..afb8624 100644
--- a/DAL/Repositories/DocumentArtRepository.cs
+++ b/DAL/Repositories/DocumentArtRepository.cs
@@ -5,7 +5,7 @@ namespace DAL.Repositories
 {
     public class DocumentArtRepository : BaseRepository<DocumentArt>
     {
-        public DocumentArtRepository() : base(new WebApiContext())
+        public DocumentArtRepository(WebApiContext context) : base(context)
         {
         }
     }
diff --git a/DAL/Repositories/DocumentArtToDepartmentRepository.cs b/DAL/Repositories/DocumentArtToDepartmentRepository.cs
index 0e4edcd..1c04d73 100644
--- a/DAL/Repositories/DocumentArtToDepartmentRepository.cs
+++ b/DAL/Repositories/DocumentArtToDepartmentRepository.cs
@@ -10,7 +10,7 @@ namespace DAL.Repositories
 {
     public class DocumentArtToDepartmentRepository : BaseRepository<DocumentArtToDepartment>
     {
-        public DocumentArtToDepartmentRepository() : base(new WebApiContext())
+        public DocumentArtToDepartmentRepository(WebApiContext context) : base(context)
         {
         }
 
diff --git a/DAL/Repositories/EmployeeAttributeRepository.cs b/DAL/Repositories/EmployeeAttributeRepository.cs
index 9df3f78..91f661e 100644
--- a/DAL/Repositories/EmployeeAttributeRepository.cs
+++ b/DAL/Repositories/EmployeeAttributeRepository.cs
@@ -5,7 +5,7 @@ namespace DAL.Repositories
 {
     public class EmployeeAttributeRepository : BaseRepository<EmployeeAttribute>
     {
-        public EmployeeAttributeRepository() : base(new WebApiContext())
+        public EmployeeAttributeRepository(WebApiContext context) : base(context)
         {
         }
     }
diff --git a/DAL/Repositories/EmployeeRepository.cs b/DAL/Repositories/EmployeeRepository.cs
index 0065e26..f564584 100644
--- a/DAL/Repositories/EmployeeRepository.cs
+++ b/DAL/Repositories/EmployeeRepository.cs
@@ -10,7 +10,7 @@ namespace DAL.Repositories
 {
     public class EmployeeRepository : BaseRepository<Employee>
     {
-        public EmployeeRepository() : base(new WebApiContext())
+        public EmployeeRepository(WebApiContext context) : base(context)
         {
         }
 
diff --git a/DAL/Repositories/EmployeeStatusRepository.cs b/DAL/Repositories/EmployeeStatusRepository.cs
index 8711a80..65e987e 100644
--- a/DAL/Repositories/EmployeeStatusRepository.cs
+++ b/DAL/Repositories/EmployeeStatusRepository.cs
@@ -5,7 +5,7 @@ namespace DAL.Repositories
 {
     public class EmployeeStatusRepository : BaseRepository<EmployeeStatus>
     {
-        public EmployeeStatusRepository() : base(new WebApiContext())
+        public EmployeeStatusRepository(WebApiContext context) : base(context)
         {
         }
     }
diff --git a/DAL/Repositories/EmployeeToAttributeRepository.cs b/DAL/Repositories/EmployeeToAttributeRepository.cs
index 7edf87c..9c9a03e 100644
--- a/DAL/Repositories/EmployeeToAttributeRepository.cs
+++ b/DAL/Repositories/EmployeeToAttributeRepository.cs
@@ -10,7 +10,7 @@ namespace DAL.Repositories
 {
     public class EmployeeToAttributeRepository : BaseRepository<EmployeeToAttribute>
     {
-        public EmployeeToAttributeRepository() : base(new WebApiContext())
+        public EmployeeToAttributeRepository(WebApiContext context) : base(context)
         {
         }
 
diff --git a/DAL/Repositories/EmployeeToDepartmentRepository.cs b/DAL/Repositories/EmployeeToDepartmentRepository.cs
index dab874a..eed68f2 100644
--- a/DAL/Repositories/EmployeeToDepartmentRepository.cs
+++ b/DAL/Repositories/EmployeeToDepartmentRepository.cs
@@ -10,7 +10,7 @@ namespace DAL.Repositories
 {
     public class EmployeeToDepartmentRepository : BaseRepository<EmployeeToDepartment>
     {
-        public EmployeeToDepartmentRepository() : base(new WebApiContext())
+        public EmployeeToDepartmentRepository(WebApiContext context) : base(context)
         {
         }
 
diff --git a/DAL/Repositories/EmployeeToWebAppRepository.cs b/DAL/Repositories/EmployeeToWebAppRepository.cs
index 9ad32f3..ef220fa 100644
--- a/DAL/Repositories/EmployeeToWebAppRepository.cs
+++ b/DAL/Repositories/EmployeeToWebAppRepository.cs
@@ -12,7 +12,7 @@ namespace DAL.Repositories
 {
     public class EmployeeToWebAppRepository : BaseRepository<EmployeeToWebApp>
     {
-        public EmployeeToWebAppRepository() : base(new WebApiContext())
+        public EmployeeToWebAppRepository(WebApiContext context) : base(context)
         {
         }
 
diff --git a/DAL/Repositories/ProjectRepository.cs b/DAL/Repositories/ProjectRepository.cs
index 9db6c2a..5f7b74d 100644
--- a/DAL/Repositories/ProjectRepository.cs
+++ b/DAL/Repositories/ProjectRepository.cs
@@ -5,7 +5,7 @@ namespace DAL.Repositories
 {
     public class ProjectRepository : BaseRepository<Project>
     {
-        public ProjectRepository() : base(new WebApiContext())
+        public ProjectRepository(WebApiContext context) : base(context)
         {
         }
     }
diff --git a/DAL/Repositories/RangRepository.cs b/DAL/Repositories/RangRepository.cs
index 17fba1b..2f86175 100644
--- a/DAL/Repositories/RangRepository.cs
+++ b/DAL/Repositories/RangRepository.cs
@@ -5,7 +5,7 @@ namespace DAL.Repositories
 {
     public class RangRepository : BaseRepository<Rang>
     {
-        public RangRepository() : base(new WebApiContext())
+        public RangRepository(WebApiContext context) : base(context)
         {
         }
     }
diff --git a/DAL/Repositories/SubsidiaryRepository.cs b/DAL/Repositories/SubsidiaryRepository.cs
index d9ede89..153c6b8 100644
--- a/DAL/Repositories/SubsidiaryRepository.cs
+++ b/DAL/Repositories/SubsidiaryRepository.cs
@@ -5,7 +5,7 @@ namespace DAL.Repositories
 {
     public class SubsidiaryRepository : BaseRepository<Subsidiary>
     {
-        public SubsidiaryRepository() : base(new WebApiContext())
+        public SubsidiaryRepository(WebApiContext context) : base(context)
         {
         }
     }
diff --git a/DAL/Repositories/WebAppAdditionalRoleRepository.cs b/DAL/Repositories/WebAppAdditionalRoleRepository.cs
index 67d31c0..cb32ee2 100644
--- a/DAL/Repositories/WebAppAdditionalRoleRepository.cs
+++ b/DAL/Repositories/WebAppAdditionalRoleRepository.cs
@@ -10,7 +10,7 @@ namespace DAL.Repositories
 {
     public class WebAppAdditionalRoleRepository : BaseRepository<WebAppAdditionalRole>
     {
-        public WebAppAdditionalRoleRepository() : base(new WebApiContext())
+        public WebAppAdditionalRoleRepository(WebApiContext context) : base(context)
         {
         }
 
diff --git a/DAL/Repositories/WebAppRepository.cs b/DAL/Repositories/WebAppRepository.cs
index 4b6483f..ade638c 100644
--- a/DAL/Repositories/WebAppRepository.cs
+++ b/DAL/Repositories/WebAppRepository.cs
@@ -5,7 +5,7 @@ namespace DAL.Repositories
 {
     public class WebAppRepository : BaseRepository<WebApp>
     {
-        public WebAppRepository() : base(new WebApiContext())
+        public WebAppRepository(WebApiContext context) : base(context)
         {
         }
     }
diff --git a/DAL/Repositories/WebAppRoleRepository.cs b/DAL/Repositories/WebAppRoleRepository.cs
index 6c82c4a..cb581ee 100644
--- a/DAL/Repositories/WebAppRoleRepository.cs
+++ b/DAL/Repositories/WebAppRoleRepository.cs
@@ -5,7 +5,7 @@ namespace DAL.Repositories
 {
     public class WebAppRoleRepository : BaseRepository<WebAppRole>
     {
-        public WebAppRoleRepository() : base(new WebApiContext())
+        public WebAppRoleRepository(WebApiContext context) : base(context)
         {
         }
     }
diff --git a/DAL/Repositories/WebAppToDepartmentRepository.cs b/DAL/Repositories/WebAppToDepartmentRepository.cs
index e43c27e..d92ea0a 100644
--- a/DAL/Repositories/WebAppToDepartmentRepository.cs
+++ b/DAL/Repositories/WebAppToDepartmentRepository.cs
@@ -12,7 +12,7 @@ namespace DAL.Repositories
 {
     public class WebAppToDepartmentRepository : BaseRepository<WebAppToDepartment>
     {
-        public WebAppToDepartmentRepository() : base(new WebApiContext())
+        public WebAppToDepartmentRepository(WebApiContext context) : base(context)
         {
         }
 
diff --git a/DAL/Repositories/WebAppToWebAppAdditionalRoleRepository.cs b/DAL/Repositories/WebAppToWebAppAdditionalRoleRepository.cs
index 17d7444..72b4d24 100644
--- a/DAL/Repositories/WebAppToWebAppAdditionalRoleRepository.cs
+++ b/DAL/Repositories/WebAppToWebAppAdditionalRoleRepository.cs
@@ -12,7 +12,7 @@ namespace DAL.Repositories
 {
     public class WebAppToWebAppAdditionalRoleRepository : BaseRepository<WebAppToWebAppAdditionalRole>
     {
-        public WebAppToWebAppAdditionalRoleRepository() : base(new WebApiContext())
+        public WebAppToWebAppAdditionalRoleRepository(WebApiContext context) : base(context)
         {
         }
 
diff --git a/DAL/Repositories/WebAppToWebAppRoleRepository.cs b/DAL/Repositories/WebAppToWebAppRoleRepository.cs
index ca1fd3c..8084eb6 100644
--- a/DAL/Repositories/WebAppToWebAppRoleRepository.cs
+++ b/DAL/Repositories/WebAppToWebAppRoleRepository.cs
@@ -10,7 +10,7 @@ namespace DAL.Repositories
 {
     public class WebAppToWebAppRoleRepository : BaseRepository<WebAppToWebAppRole>
     {
-        public WebAppToWebAppRoleRepository() : base(new WebApiContext())
+        public WebAppToWebAppRoleRepository(WebApiContext context) : base(context)
         {
         }
 
diff --git a/DAL/Repositories/WindreamColumnsToDepartmentRepository.cs b/DAL/Repositories/WindreamColumnsToDepartmentRepository.cs
index d3acd5a..99b2b78 100644
--- a/DAL/Repositories/WindreamColumnsToDepartmentRepository.cs
+++ b/DAL/Repositories/WindreamColumnsToDepartmentRepository.cs
@@ -10,7 +10,7 @@ namespace DAL.Repositories
 {
     public class WindreamColumnsToDepartmentRepository : BaseRepository<WindreamColumnsToDepartment>
     {
-        public WindreamColumnsToDepartmentRepository() : base(new WebApiContext())
+        public WindreamColumnsToDepartmentRepository(WebApiContext context) : base(context)
         {
         }
 
diff --git a/DAL/Repositories/WindreamIndexRepository.cs b/DAL/Repositories/WindreamIndexRepository.cs
index 48d8d95..3971847 100644
--- a/DAL/Repositories/WindreamIndexRepository.cs
+++ b/DAL/Repositories/WindreamIndexRepository.cs
@@ -10,7 +10,7 @@ namespace DAL.Repositories
 {
     public class WindreamIndexRepository : BaseRepository<WindreamIndex>
     {
-        public WindreamIndexRepository() : base(new WebApiContext())
+        public WindreamIndexRepository(WebApiContext context) : base(context)
         {
         }
 
diff --git a/DAL/Repositories/WindreamIndexToWindreamSearchToDepartmentRepository.cs b/DAL/Repositories/WindreamIndexToWindreamSearchToDepartmentRepository.cs
index 810151c..1cc5a52 100644
--- a/DAL/Repositories/WindreamIndexToWindreamSearchToDepartmentRepository.cs
+++ b/DAL/Repositories/WindreamIndexToWindreamSearchToDepartmentRepository.cs
@@ -10,7 +10,7 @@ namespace DAL.Repositories
 {
     public class WindreamIndexToWindreamSearchToDepartmentRepository : BaseRepository<WindreamIndexToWindreamSearchToDepartment>
     {
-        public WindreamIndexToWindreamSearchToDepartmentRepository() : base(new WebApiContext())
+        public WindreamIndexToWindreamSearchToDepartmentRepository(WebApiContext context) : base(context)
         {
         }
 
diff --git a/DAL/Repositories/WindreamInputFolderRepository.cs b/DAL/Repositories/WindreamInputFolderRepository.cs
index 732049a..06f9410 100644
--- a/DAL/Repositories/WindreamInputFolderRepository.cs
+++ b/DAL/Repositories/WindreamInputFolderRepository.cs
@@ -10,7 +10,7 @@ namespace DAL.Repositories
 {
     public class WindreamInputFolderRepository : BaseRepository<WindreamInputFolder>
     {
-        public WindreamInputFolderRepository() : base(new WebApiContext())
+        public WindreamInputFolderRepository(WebApiContext context) : base(context)
         {
         }
 
diff --git a/DAL/Repositories/WindreamSearchItemRepository.cs b/DAL/Repositories/WindreamSearchItemRepository.cs
index 83391fa..3558d6a 100644
--- a/DAL/Repositories/WindreamSearchItemRepository.cs
+++ b/DAL/Repositories/WindreamSearchItemRepository.cs
@@ -10,7 +10,7 @@ namespace DAL.Repositories
 {
     public class WindreamSearchItemRepository : BaseRepository<WindreamSearchItem>
     {
-        public WindreamSearchItemRepository() : base(new WebApiContext())
+        public WindreamSearchItemRepository(WebApiContext context) : base(context)
         {
         }
 
diff --git a/DAL/Repositories/WindreamSearchItemToWindreamSearchToDepartmentRepository.cs b/DAL/Repositories/WindreamSearchItemToWindreamSearchToDepartmentRepository.cs
index ba925dc..7528a39 100644
--- a/DAL/Repositories/WindreamSearchItemToWindreamSearchToDepartmentRepository.cs
+++ b/DAL/Repositories/WindreamSearchItemToWindreamSearchToDepartmentRepository.cs
@@ -10,7 +10,7 @@ namespace DAL.Repositories
 {
     public class WindreamSearchItemToWindreamSearchToDepartmentRepository : BaseRepository<WindreamSearchItemToWindreamSearchToDepartment>
     {
-        public WindreamSearchItemToWindreamSearchToDepartmentRepository() : base(new WebApiContext())
+        public WindreamSearchItemToWindreamSearchToDepartmentRepository(WebApiContext context) : base(context)
         {
         }
 
diff --git a/DAL/Repositories/WindreamSearchRepository.cs b/DAL/Repositories/WindreamSearchRepository.cs
index ebc17ea..0f1c918 100644
--- a/DAL/Repositories/WindreamSearchRepository.cs
+++ b/DAL/Repositories/WindreamSearchRepository.cs
@@ -10,7 +10,7 @@ namespace DAL.Repositories
 {
     public class WindreamSearchRepository : BaseRepository<WindreamSearch>
     {
-        public WindreamSearchRepository() : base(new WebApiContext())
+        public WindreamSearchRepository(WebApiContext context) : base(context)
         {
         }
 
diff --git a/DAL/Repositories/WindreamSearchToDepartmentRepository.cs b/DAL/Repositories/WindreamSearchToDepartmentRepository.cs
index 591e610..dc28e1e 100644
--- a/DAL/Repositories/WindreamSearchToDepartmentRepository.cs
+++ b/DAL/Repositories/WindreamSearchToDepartmentRepository.cs
@@ -10,7 +10,7 @@ namespace DAL.Repositories
 {
     public class WindreamSearchToDepartmentRepository : BaseRepository<WindreamSearchToDepartment>
     {
-        public WindreamSearchToDepartmentRepository() : base(new WebApiContext())
+        public WindreamSearchToDepartmentRepository(WebApiContext context) : base(context)
         {
         }
 
diff --git a/DAL/WebApiContext.cs b/DAL/WebApiContext.cs
index 8621862..f1180ac 100644
--- a/DAL/WebApiContext.cs
+++ b/DAL/WebApiContext.cs
@@ -8,10 +8,6 @@ namespace DAL
 {
     public partial class WebApiContext : WebApiBaseContext
     {
-        public WebApiContext() : base()
-        {
-        }
-
         public WebApiContext(DbContextOptions<DbContext> options) : base(options)
         {
         }
diff --git a/DAL/_Shared/SharedRepositories/WebAppEmployeeInfoRepository.cs b/DAL/_Shared/SharedRepositories/WebAppEmployeeInfoRepository.cs
index fac6207..afdb16d 100644
--- a/DAL/_Shared/SharedRepositories/WebAppEmployeeInfoRepository.cs
+++ b/DAL/_Shared/SharedRepositories/WebAppEmployeeInfoRepository.cs
@@ -11,7 +11,7 @@ namespace DAL._Shared.SharedRepositories
     public class WebAppEmployeeInfoRepository : BaseRepository<WebAppEmployeeInfo>
 
     {
-        public WebAppEmployeeInfoRepository() : base(new WebApiContext())
+        public WebAppEmployeeInfoRepository(WebApiContext context) : base(context)
         {
         }
 
diff --git a/DAL/_Shared/SharedRepositories/WebAppUserRepository.cs b/DAL/_Shared/SharedRepositories/WebAppUserRepository.cs
index 191ff67..a3659a7 100644
--- a/DAL/_Shared/SharedRepositories/WebAppUserRepository.cs
+++ b/DAL/_Shared/SharedRepositories/WebAppUserRepository.cs
@@ -5,7 +5,7 @@ namespace DAL._Shared.SharedRepositories
 {
     public class WebAppUserRepository : BaseRepository<WebAppUser>
     {
-        public WebAppUserRepository() : base(new WebApiContext())
+        public WebAppUserRepository(WebApiContext context) : base(context)
         {
         }
     }
diff --git a/StaffDBServer/_Shared/SharedControllers/InfoController.cs b/StaffDBServer/_Shared/SharedControllers/InfoController.cs
index 88b5c26..197cff3 100644
--- a/StaffDBServer/_Shared/SharedControllers/InfoController.cs
+++ b/StaffDBServer/_Shared/SharedControllers/InfoController.cs
@@ -9,7 +9,7 @@ namespace StaffDBServer.SharedExtensions
     [ApiController]
     public class InfoController : InfoBaseController
     {
-        public InfoController() : base(new WebApiContext())
+        public InfoController(WebApiContext context) : base(context)
         {
         }
     }
diff --git a/StaffDBServer/_Shared/SharedControllers/WebAppUserController.cs b/StaffDBServer/_Shared/SharedControllers/WebAppUserController.cs
index bd00ea3..e7fa4c5 100644
--- a/StaffDBServer/_Shared/SharedControllers/WebAppUserController.cs
+++ b/StaffDBServer/_Shared/SharedControllers/WebAppUserController.cs
@@ -14,8 +14,13 @@ namespace StaffDBServer.SharedControllers
     [JWTAuthorizeAttribute]
     public class WebAppUserController : BaseMiniController
     {
-        public WebAppUserController() : base(new WebApiContext())
+        private readonly WebAppUserRepository webAppUserRepository;
+        WebAppUserHelper webAppUserHelper;
+
+        public WebAppUserController(WebApiContext context, WebAppUserRepository webAppUserRepository, WebAppUserHelper webAppUserHelper) : base(context)
         {
+            this.webAppUserRepository = webAppUserRepository;
+            this.webAppUserHelper = webAppUserHelper;
         }
 
         [HttpPost("Culture")]
@@ -23,8 +28,6 @@ namespace StaffDBServer.SharedControllers
         {
             try
             {
-                //User Should by in the DB
-                WebAppUserRepository webAppUserRepository = new WebAppUserRepository();
                 WebAppUser userFromDB = await webAppUserRepository.GetByAsync(u => u.LoginName == userFromClient.LoginName, false);
 
                 if (userFromDB != default) //first login, get User from WebAppEmployeeInfo
@@ -51,7 +54,7 @@ namespace StaffDBServer.SharedControllers
             try
             {
                 var accessToken = Request.Headers[HeaderNames.Authorization];
-                WebAppUserHelper webAppUserHelper = new WebAppUserHelper();
+                
                 WebAppUser result = await webAppUserHelper.CheckLoginWithJWTAsync(accessToken, userFromClient.ClientVersion);
                 return new OkObjectResult(result);
             }
@@ -67,8 +70,7 @@ namespace StaffDBServer.SharedControllers
         public async Task<IActionResult> LoginWithNameAndPasswordAsync([FromBody] WebAppUser userFromClient, int webApiId)
         {
             try
-            {
-                WebAppUserHelper webAppUserHelper = new WebAppUserHelper();
+            {                
                 var result = await webAppUserHelper.CheckLoginWithNameAndPasswordAsync(userFromClient, webApiId);
                 return new OkObjectResult(result);
             }
@@ -85,7 +87,6 @@ namespace StaffDBServer.SharedControllers
         {
             try
             {
-                WebAppUserHelper webAppUserHelper = new WebAppUserHelper();
                 var result = await webAppUserHelper.CheckLoginWithNameAndPasswordAsync(userFromClient);
                 return new OkObjectResult(result);
             }
diff --git a/StaffDBServer/_Shared/SharedControllers/WebAppUserHelper.cs b/StaffDBServer/_Shared/SharedControllers/WebAppUserHelper.cs
index 45039bb..3f9b89e 100644
--- a/StaffDBServer/_Shared/SharedControllers/WebAppUserHelper.cs
+++ b/StaffDBServer/_Shared/SharedControllers/WebAppUserHelper.cs
@@ -14,9 +14,18 @@ namespace StaffDBServer.SharedControllers
 
         public int GlbWebApiIdStaffDB { get; private set; } = 2;
 
-        public async Task<WebAppUser> CheckLoginWithJWTAsync(StringValues accessToken, string clientVersion)
+        WebAppUserRepository webAppUserRepository;
+
+        WebAppEmployeeInfoRepository webAppEmployeeInfoRepository;
+
+        public WebAppUserHelper(WebAppUserRepository webAppUserRepository, WebAppEmployeeInfoRepository webAppEmployeeInfoRepository)
         {
-            WebAppUserRepository webAppUserRepository = new WebAppUserRepository();
+            this.webAppUserRepository = webAppUserRepository;
+            this.webAppEmployeeInfoRepository = webAppEmployeeInfoRepository;
+        }
+
+        public async Task<WebAppUser> CheckLoginWithJWTAsync(StringValues accessToken, string clientVersion)
+        {            
             if (!JwtManager.IsValidatJwtTokenSubject(accessToken))
             {
                 throw new UnauthorizedAccessException($"Not valid JWT");
@@ -27,8 +36,7 @@ namespace StaffDBServer.SharedControllers
             {
                 throw new UnauthorizedAccessException($"Unable to decrypt JWT");
             }
-
-            WebAppEmployeeInfoRepository webAppEmployeeInfoRepository = new WebAppEmployeeInfoRepository();
+                        
             WebAppEmployeeInfo webAppEmployeeInfo = await webAppEmployeeInfoRepository.GetByAsync(x => x.LoginName == ldapUser.LoginName);
             if (webAppEmployeeInfo == default)
             {
@@ -63,10 +71,9 @@ namespace StaffDBServer.SharedControllers
         public async Task<WebAppUser> CheckLoginWithNameAndPasswordAsync(WebAppUser userFromClient, int webAppId)
         {
             try
-            {
-                WebAppEmployeeInfoRepository webAppEmployeeInfoRepository = new WebAppEmployeeInfoRepository();
+            {                
                 WebAppEmployeeInfo webAppEmployeeInfo = await webAppEmployeeInfoRepository.GetByAsync(x => x.LoginName == userFromClient.LoginName && x.WebAppId == webAppId);
-                WebAppUserRepository webAppUserRepository = new WebAppUserRepository();
+            
                 return await DoCheckLoginWithNameAndPasswordAsync(userFromClient, webAppUserRepository, webAppEmployeeInfoRepository);
             }
             catch (Exception ex)
@@ -79,9 +86,8 @@ namespace StaffDBServer.SharedControllers
         {
             try
             {
-                WebAppEmployeeInfoRepository webAppEmployeeInfoRepository = new WebAppEmployeeInfoRepository();
                 WebAppEmployeeInfo webAppEmployeeInfo = await webAppEmployeeInfoRepository.GetByAsync(x => x.LoginName == userFromClient.LoginName && x.WebAppId == GlbWebApiIdStaffDB);
-                WebAppUserRepository webAppUserRepository = new WebAppUserRepository();
+            
                 return await DoCheckLoginWithNameAndPasswordAsync(userFromClient, webAppUserRepository, webAppEmployeeInfoRepository);
             }
             catch (Exception ex)