diff --git a/src/CMSMicroservice.Infrastructure/Services/GenerateJwtTokenService.cs b/src/CMSMicroservice.Infrastructure/Services/GenerateJwtTokenService.cs
index 6b1c494..8bc133c 100644
--- a/src/CMSMicroservice.Infrastructure/Services/GenerateJwtTokenService.cs
+++ b/src/CMSMicroservice.Infrastructure/Services/GenerateJwtTokenService.cs
@@ -31,12 +31,11 @@ public class GenerateJwtTokenService : IGenerateJwtToken
         };
         claims.Add(new Claim("MobileNumber", user.Mobile));
 
-        if (!string.IsNullOrWhiteSpace(user.FirstName))
-            claims.Add(new Claim("FirstName", user.FirstName));
+        claims.Add(new Claim("NationalCode", !string.IsNullOrWhiteSpace(user.NationalCode) ? user.NationalCode : ""));
+        
+        claims.Add(new Claim("FirstName", !string.IsNullOrWhiteSpace(user.FirstName) ? user.FirstName : ""));
 
-
-        if (!string.IsNullOrWhiteSpace(user.LastName))
-            claims.Add(new Claim("LastName", user.LastName));
+        claims.Add(new Claim("LastName", !string.IsNullOrWhiteSpace(user.LastName) ? user.LastName : ""));
 
         if (user.UserContracts.Any(a => a.Contract.Type == ContractType.Main))
             claims.Add(new Claim("IsSignMainContract", true.ToString()));