diff --git a/source/EasyWay.WebApi/Internals/Contexts/UserContext.cs b/source/EasyWay.WebApi/Internals/Contexts/UserContext.cs
index dd97d85..3ca84ca 100644
--- a/source/EasyWay.WebApi/Internals/Contexts/UserContext.cs
+++ b/source/EasyWay.WebApi/Internals/Contexts/UserContext.cs
@@ -6,17 +6,15 @@ internal sealed class UserContext : IUserContext
     {
         public UserContext(IHttpContextAccessor httpContextAccessor) 
         {
-            var userId = httpContextAccessor
+            UserId = httpContextAccessor
                 .HttpContext?
                 .User?
                 .Claims?
                 .SingleOrDefault(x => x.Type == "sub")?
                 .Value;
-
-            UserId = userId is null ? null : new Guid(userId);
         }
 
-        public Guid? UserId { get; }
+        public string? UserId { get; }
 
         public bool IsAuthenticated => UserId is not null;
     }
diff --git a/source/EasyWay/IUserContext.cs b/source/EasyWay/IUserContext.cs
index 798a113..9b5278f 100644
--- a/source/EasyWay/IUserContext.cs
+++ b/source/EasyWay/IUserContext.cs
@@ -2,7 +2,7 @@
 {
     public interface IUserContext
     {
-        Guid? UserId { get; }
+        string? UserId { get; }
 
         bool IsAuthenticated { get; }
     }
diff --git a/source/EasyWay/Internals/Contexts/DefaultUserContext.cs b/source/EasyWay/Internals/Contexts/DefaultUserContext.cs
index a08d2d2..7c6874f 100644
--- a/source/EasyWay/Internals/Contexts/DefaultUserContext.cs
+++ b/source/EasyWay/Internals/Contexts/DefaultUserContext.cs
@@ -1,8 +1,8 @@
 namespace EasyWay.Internals.Contexts
 {
-    internal class DefaultUserContext : IUserContext
+    internal sealed class DefaultUserContext : IUserContext
     {
-        public Guid? UserId => null;
+        public string? UserId => null;
 
         public bool IsAuthenticated => false;
     }