diff --git a/src/VirtoCommerce.Xapi.Core/Extensions/ClaimsPrincipalExtensions.cs b/src/VirtoCommerce.Xapi.Core/Extensions/ClaimsPrincipalExtensions.cs
index 33d3d30..6f2c21a 100644
--- a/src/VirtoCommerce.Xapi.Core/Extensions/ClaimsPrincipalExtensions.cs
+++ b/src/VirtoCommerce.Xapi.Core/Extensions/ClaimsPrincipalExtensions.cs
@@ -1,4 +1,5 @@
 using System.Security.Claims;
+using VirtoCommerce.Platform.Core.Security;
 using static VirtoCommerce.Xapi.Core.ModuleConstants;
 
 namespace VirtoCommerce.Xapi.Core.Extensions;
@@ -7,6 +8,6 @@ public static class ClaimsPrincipalExtensions
 {
     public static string GetCurrentUserId(this ClaimsPrincipal claimsPrincipal)
     {
-        return claimsPrincipal?.FindFirstValue(ClaimTypes.NameIdentifier) ?? claimsPrincipal?.FindFirstValue("name") ?? AnonymousUser.UserName;
+        return claimsPrincipal?.GetUserId() ?? AnonymousUser.UserName;
     }
 }
diff --git a/src/VirtoCommerce.Xapi.Core/Extensions/ResolveEventStreamContextExtensions.cs b/src/VirtoCommerce.Xapi.Core/Extensions/ResolveEventStreamContextExtensions.cs
index 74c32cb..ef59e21 100644
--- a/src/VirtoCommerce.Xapi.Core/Extensions/ResolveEventStreamContextExtensions.cs
+++ b/src/VirtoCommerce.Xapi.Core/Extensions/ResolveEventStreamContextExtensions.cs
@@ -9,7 +9,7 @@ public static class ResolveEventStreamContextExtensions
         public static string GetCurrentUserId(this IResolveEventStreamContext resolveContext)
         {
             var claimsPrincipal = GetCurrentPrincipal(resolveContext);
-            return claimsPrincipal?.FindFirstValue(ClaimTypes.NameIdentifier) ?? claimsPrincipal?.FindFirstValue("name") ?? ModuleConstants.AnonymousUser.UserName;
+            return claimsPrincipal?.GetCurrentUserId();
         }
 
         public static ClaimsPrincipal GetCurrentPrincipal(this IResolveEventStreamContext resolveContext)
diff --git a/src/VirtoCommerce.Xapi.Core/VirtoCommerce.Xapi.Core.csproj b/src/VirtoCommerce.Xapi.Core/VirtoCommerce.Xapi.Core.csproj
index c8361dc..5d8faa3 100644
--- a/src/VirtoCommerce.Xapi.Core/VirtoCommerce.Xapi.Core.csproj
+++ b/src/VirtoCommerce.Xapi.Core/VirtoCommerce.Xapi.Core.csproj
@@ -29,6 +29,7 @@
     <PackageReference Include="GraphQL.Server.Transports.AspNetCore.NewtonsoftJson" Version="5.0.2" />
     <PackageReference Include="PipelineNet" Version="0.9.0" />
     <PackageReference Include="RedLock.net" Version="2.3.2" />
+    <PackageReference Include="VirtoCommerce.Platform.Core" Version="3.861.0" />
     <PackageReference Include="VirtoCommerce.CoreModule.Core" Version="3.808.0" />
     <PackageReference Include="VirtoCommerce.CustomerModule.Core" Version="3.817.0" />
     <PackageReference Include="VirtoCommerce.SearchModule.Core" Version="3.804.0" />
diff --git a/src/VirtoCommerce.Xapi.Web/module.manifest b/src/VirtoCommerce.Xapi.Web/module.manifest
index a7cc448..9e9019d 100644
--- a/src/VirtoCommerce.Xapi.Web/module.manifest
+++ b/src/VirtoCommerce.Xapi.Web/module.manifest
@@ -4,7 +4,7 @@
   <version>3.812.0</version>
   <version-tag></version-tag>
 
-  <platformVersion>3.853.0</platformVersion>
+  <platformVersion>3.861.0</platformVersion>
   <dependencies>
     <dependency id="VirtoCommerce.Core" version="3.808.0" />
     <dependency id="VirtoCommerce.Customer" version="3.817.0" />