diff --git a/IRC.Core.SCP/IRC.Core.SCP.csproj b/IRC.Core.SCP/IRC.Core.SCP.csproj
index 999a17361..ca9724a3b 100644
--- a/IRC.Core.SCP/IRC.Core.SCP.csproj
+++ b/IRC.Core.SCP/IRC.Core.SCP.csproj
@@ -14,9 +14,9 @@
 	  <PackageReference Include="AWSSDK.SecurityToken" Version="3.7.401.81" />
 	  <PackageReference Include="DistributedLock.Core" Version="1.0.8" />
 	  <PackageReference Include="DistributedLock.SqlServer" Version="1.0.6" />
-	  <PackageReference Include="fo-dicom" Version="5.2.1" />
-	  <PackageReference Include="fo-dicom.Codecs" Version="5.16.1" />
-	  <PackageReference Include="fo-dicom.Imaging.ImageSharp" Version="5.2.1" />
+	  <PackageReference Include="fo-dicom" Version="5.2.4" />
+	  <PackageReference Include="fo-dicom.Codecs" Version="5.16.4" />
+	  <PackageReference Include="fo-dicom.Imaging.ImageSharp" Version="5.2.4" />
 	  <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.10" />
 	  <PackageReference Include="AutoMapper" Version="13.0.1" />
 	  <PackageReference Include="Minio" Version="6.0.3" />
diff --git a/IRaCIS.Core.API/Controllers/ExtraController.cs b/IRaCIS.Core.API/Controllers/ExtraController.cs
index d072ef029..5859710db 100644
--- a/IRaCIS.Core.API/Controllers/ExtraController.cs
+++ b/IRaCIS.Core.API/Controllers/ExtraController.cs
@@ -126,7 +126,7 @@ namespace IRaCIS.Api.Controllers
             var token = _tokenService.GetToken(new UserTokenInfo()
             {
                 IdentityUserId = Guid.NewGuid(),
-                UserName = "Share001",
+                UserName = "ImageShare",
                 UserTypeEnum = UserTypeEnum.ShareImage,
 
             });
diff --git a/IRaCIS.Core.Application/Service/Management/UserService.cs b/IRaCIS.Core.Application/Service/Management/UserService.cs
index f602ec53e..971eefe6b 100644
--- a/IRaCIS.Core.Application/Service/Management/UserService.cs
+++ b/IRaCIS.Core.Application/Service/Management/UserService.cs
@@ -917,9 +917,19 @@ namespace IRaCIS.Core.Application.Service
         {
             await _fusionCache.RemoveAsync(CacheKeys.UserToken(identityUserId));
 
-            var userName = await _userRoleRepository.Where(t => t.Id == userRoleId).Select(t => t.IdentityUser.UserName).FirstOrDefaultAsync();
+            if (_identityUserRepository.Any(t => t.Id == identityUserId))
+            {
+
+                var userName = await _userRoleRepository.Where(t => t.Id == userRoleId).Select(t => t.IdentityUser.UserName).FirstOrDefaultAsync();
+
+                await _userLogRepository.AddAsync(new UserLog() { IP = _userInfo.IP, ActionIdentityUserId = identityUserId, ActionUserName = userName, OptType = UserOptType.LoginOut }, true);
+            }
+            else
+            {
+                await _userLogRepository.AddAsync(new UserLog() { IP = _userInfo.IP, ActionIdentityUserId = null, ActionUserName = _userInfo.UserName, OptType = UserOptType.LoginOut }, true);
+            }
+
 
-            await _userLogRepository.AddAsync(new UserLog() { IP = _userInfo.IP, ActionIdentityUserId = identityUserId, ActionUserName = userName, OptType = UserOptType.LoginOut }, true);
 
             return ResponseOutput.Ok();
         }
diff --git a/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs b/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs
index c2a4bf479..81b3e9ca6 100644
--- a/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs
+++ b/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs
@@ -257,7 +257,7 @@ namespace IRaCIS.Core.Application.Contracts
                         result.ReviewStatus = info.ReviewStatus;
                     }
 
-                    result.Token = _tokenService.GetToken(new UserTokenInfo() { IdentityUserId = Guid.NewGuid() });
+                    result.Token = _tokenService.GetToken(new UserTokenInfo() { IdentityUserId = Guid.NewGuid(), UserName = $"Reviewer_{inDto.EmailOrPhone}" });
                 }
             }
 
@@ -678,8 +678,9 @@ namespace IRaCIS.Core.Application.Contracts
                 Token = _tokenService.GetToken(new UserTokenInfo()
                 {
                     IdentityUserId = Guid.NewGuid(),
+
                     UserRoleId = Guid.NewGuid(),
-                    UserName = "SiteSurvey",
+                    UserName = $"SiteSurvey_{currentEntity.Email}",
                     UserTypeEnum = UserTypeEnum.Undefined,
                 })
             });