diff --git a/src/Caravel/Caravel.csproj b/src/Caravel/Caravel.csproj
index 1f00a0d..c643b35 100644
--- a/src/Caravel/Caravel.csproj
+++ b/src/Caravel/Caravel.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <OutputType>Library</OutputType>
     <IsPackable>true</IsPackable>
-    <PackageVersion>0.30.0</PackageVersion>
+    <PackageVersion>0.31.0</PackageVersion>
     <PackageTags>dotnet,sdk</PackageTags>
     <Title>Caravel</Title>
     <Description>Caravel is a package that contains common utilities for building dotnet applications.</Description>
diff --git a/src/Caravel/Security/ClaimsPrincipalExtensions.cs b/src/Caravel/Security/ClaimsPrincipalExtensions.cs
index 0b1ba63..2600e27 100644
--- a/src/Caravel/Security/ClaimsPrincipalExtensions.cs
+++ b/src/Caravel/Security/ClaimsPrincipalExtensions.cs
@@ -15,7 +15,7 @@ public static class ClaimsPrincipalExtensions
     /// <returns>Return the current user id or null if does not exists.</returns>
     public static string? UserId(this ClaimsPrincipal principal)
     {
-        return principal.Claim(SubjectClaim);
+        return principal.Claim(SubjectClaim) ?? principal.Claim(ClaimTypes.NameIdentifier);
     }
     
     /// <summary>