diff --git a/IRaCIS.Core.API/Controllers/ExtraController.cs b/IRaCIS.Core.API/Controllers/ExtraController.cs
index 39c25fc56..d6fc51f50 100644
--- a/IRaCIS.Core.API/Controllers/ExtraController.cs
+++ b/IRaCIS.Core.API/Controllers/ExtraController.cs
@@ -311,7 +311,7 @@ namespace IRaCIS.Api.Controllers
         {
             var token = _tokenService.GetToken(IRaCISClaims.Create(new UserBasicInfo()
             {
-                Id = Guid.Empty,
+                Id = Guid.NewGuid(),
                 IsReviewer = false,
                 IsAdmin = false,
                 RealName = "Share001",
diff --git a/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs b/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs
index 29e1bf50f..c7a372217 100644
--- a/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs
+++ b/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs
@@ -234,7 +234,7 @@ namespace IRaCIS.Core.Application.Contracts
                         result.ReviewStatus = info.ReviewStatus;
                     }
 
-                    result.Token = _tokenService.GetToken(IRaCISClaims.Create(new UserBasicInfo()));
+                    result.Token = _tokenService.GetToken(IRaCISClaims.Create(new UserBasicInfo() { Id= Guid.NewGuid() }));
                 }
             }