diff --git a/framework/src/Volo.Abp.Http.Client.IdentityModel.WebAssembly/Volo/Abp/Http/Client/IdentityModel/WebAssembly/AbpHttpClientIdentityModelWebAssemblyModule.cs b/framework/src/Volo.Abp.Http.Client.IdentityModel.WebAssembly/Volo/Abp/Http/Client/IdentityModel/WebAssembly/AbpHttpClientIdentityModelWebAssemblyModule.cs
index 9098bc054a..3276a97313 100644
--- a/framework/src/Volo.Abp.Http.Client.IdentityModel.WebAssembly/Volo/Abp/Http/Client/IdentityModel/WebAssembly/AbpHttpClientIdentityModelWebAssemblyModule.cs
+++ b/framework/src/Volo.Abp.Http.Client.IdentityModel.WebAssembly/Volo/Abp/Http/Client/IdentityModel/WebAssembly/AbpHttpClientIdentityModelWebAssemblyModule.cs
@@ -12,8 +12,8 @@ namespace Volo.Abp.Http.Client.IdentityModel.WebAssembly
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
             AbpClaimTypes.UserName = JwtClaimTypes.PreferredUserName;
-            //AbpClaimTypes.Name = ...; //TODO
-            //AbpClaimTypes.SurName = ...; //TODO
+            AbpClaimTypes.Name = JwtClaimTypes.GivenName;
+            AbpClaimTypes.SurName = JwtClaimTypes.FamilyName;
             AbpClaimTypes.UserId = JwtClaimTypes.Subject;
             AbpClaimTypes.Role = JwtClaimTypes.Role;
             AbpClaimTypes.Email = JwtClaimTypes.Email;
diff --git a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpUserClaimsPrincipalFactory.cs b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpUserClaimsPrincipalFactory.cs
index 9946ac5b37..11abe2bdf3 100644
--- a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpUserClaimsPrincipalFactory.cs
+++ b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpUserClaimsPrincipalFactory.cs
@@ -38,6 +38,7 @@ namespace Volo.Abp.Identity
             {
                 identity.AddIfNotContains(new Claim(AbpClaimTypes.Name, user.Name));
             }
+
             if (!user.Surname.IsNullOrWhiteSpace())
             {
                 identity.AddIfNotContains(new Claim(AbpClaimTypes.SurName, user.Surname));
@@ -47,12 +48,14 @@ namespace Volo.Abp.Identity
             {
                 identity.AddIfNotContains(new Claim(AbpClaimTypes.PhoneNumber, user.PhoneNumber));
             }
+
             identity.AddIfNotContains(new Claim(AbpClaimTypes.PhoneNumberVerified, user.PhoneNumberConfirmed.ToString()));
 
             if (!user.Email.IsNullOrWhiteSpace())
             {
                 identity.AddIfNotContains(new Claim(AbpClaimTypes.Email, user.Email));
             }
+
             identity.AddIfNotContains(new Claim(AbpClaimTypes.EmailVerified, user.EmailConfirmed.ToString()));
 
             return principal;
diff --git a/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/AspNetIdentity/AbpUserClaimsFactory.cs b/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/AspNetIdentity/AbpUserClaimsFactory.cs
index 9643655639..e18e6a219b 100644
--- a/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/AspNetIdentity/AbpUserClaimsFactory.cs
+++ b/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/AspNetIdentity/AbpUserClaimsFactory.cs
@@ -1,10 +1,12 @@
-using System.Linq;
+using System;
+using System.Linq;
 using System.Security.Claims;
 using System.Threading.Tasks;
 using IdentityModel;
 using Microsoft.AspNetCore.Identity;
 using Volo.Abp.DependencyInjection;
 using Volo.Abp.Identity;
+using IdentityUser = Volo.Abp.Identity.IdentityUser;
 
 namespace Volo.Abp.IdentityServer.AspNetIdentity
 {
@@ -69,6 +71,19 @@ namespace Volo.Abp.IdentityServer.AspNetIdentity
                 }
             }
 
+            if (user is IdentityUser identityUser)
+            {
+                if (!identityUser.Name.IsNullOrEmpty())
+                {
+                    identity.AddIfNotContains(new Claim(JwtClaimTypes.GivenName, identityUser.Name));
+                }
+
+                if (!identityUser.Surname.IsNullOrEmpty())
+                {
+                    identity.AddIfNotContains(new Claim(JwtClaimTypes.FamilyName, identityUser.Surname));
+                }
+            }
+
             return principal;
         }
     }