diff --git a/IRaCIS.Core.Application/Service/Management/UserService.cs b/IRaCIS.Core.Application/Service/Management/UserService.cs
index 4eaefe28e..8f8523edf 100644
--- a/IRaCIS.Core.Application/Service/Management/UserService.cs
+++ b/IRaCIS.Core.Application/Service/Management/UserService.cs
@@ -829,7 +829,7 @@ namespace IRaCIS.Core.Application.Service
             var userLoginReturnModel = new LoginReturnDTO();
 
 
-            var loginUser = await _identityUserRepository.Where(u => u.UserName.Equals(userName) && u.Password == password).ProjectTo<UserBasicInfo>(_mapper.ConfigurationProvider).FirstOrDefaultAsync();
+            var loginUser = await _userRepository.Where(u => u.UserName.Equals(userName) && u.Password == password).ProjectTo<UserBasicInfo>(_mapper.ConfigurationProvider).FirstOrDefaultAsync();
 
             if (loginUser == null)
             {
@@ -991,11 +991,6 @@ namespace IRaCIS.Core.Application.Service
 
             var loginUser = await _identityUserRepository.Where(u => u.UserName.Equals(userName) && u.Password == password).ProjectTo<UserBasicInfo>(_mapper.ConfigurationProvider).FirstOrDefaultAsync();
 
-            if (loginUser == null)
-            {
-                loginUser = await _identityUserRepository.Where(u => u.UserName.Equals(userName) && u.Password == password).ProjectTo<UserBasicInfo>(_mapper.ConfigurationProvider).FirstOrDefaultAsync();
-            }
-
             if (loginUser == null)
             {
 
diff --git a/IRaCIS.Core.Application/Service/Management/_MapConfig.cs b/IRaCIS.Core.Application/Service/Management/_MapConfig.cs
index 9db604cc6..8a7dd7c2b 100644
--- a/IRaCIS.Core.Application/Service/Management/_MapConfig.cs
+++ b/IRaCIS.Core.Application/Service/Management/_MapConfig.cs
@@ -147,7 +147,10 @@ namespace IRaCIS.Core.Application.Service
                 .ForMember(d => d.UserTypeShortName, c => c.MapFrom(t => t.UserTypeRole.UserTypeShortName));
 
 
-            CreateMap<IdentityUser, User>();
+
+            CreateMap<User, IdentityUser>();
+
+            CreateMap<IdentityUser, UserBasicInfo>();
 
         }
     }
diff --git a/IRaCIS.Core.Application/TestService.cs b/IRaCIS.Core.Application/TestService.cs
index 3d68451c3..95bd3fbe8 100644
--- a/IRaCIS.Core.Application/TestService.cs
+++ b/IRaCIS.Core.Application/TestService.cs
@@ -177,6 +177,8 @@ namespace IRaCIS.Core.Application.Service
                 await _userRepository.BatchUpdateNoTrackingAsync(t => emailUserIdList.Contains(t.Id), u => new User() { IdentityUserId = identityUserId });
             }
 
+            await _identityUserRepository.SaveChangesAsync();
+
             return ResponseOutput.Ok();
         }