diff --git a/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/AbpIdentityServerDomainModule.cs b/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/AbpIdentityServerDomainModule.cs
index 87cd39e4c8..ef4c7cd76e 100644
--- a/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/AbpIdentityServerDomainModule.cs
+++ b/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/AbpIdentityServerDomainModule.cs
@@ -14,7 +14,7 @@ namespace Volo.Abp.IdentityServer
         {
             services.Configure<AbpAutoMapperOptions>(options =>
             {
-                options.AddProfile<ClientAutoMapperProfile>(/*TODO: validate: true*/);
+                options.AddProfile<ClientAutoMapperProfile>(validate: true);
             });
 
             services.AddAssemblyOf<AbpIdentityServerDomainModule>();
diff --git a/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/Clients/ClientAutoMapperProfile.cs b/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/Clients/ClientAutoMapperProfile.cs
index fbec0430b8..0280ed4bda 100644
--- a/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/Clients/ClientAutoMapperProfile.cs
+++ b/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/Clients/ClientAutoMapperProfile.cs
@@ -1,4 +1,9 @@
-using AutoMapper;
+using System.Collections.Generic;
+using System.Security.Claims;
+using AutoMapper;
+using Volo.Abp.IdentityServer.ApiResources;
+using Volo.Abp.IdentityServer.Grants;
+using Volo.Abp.IdentityServer.IdentityResources;
 
 namespace Volo.Abp.IdentityServer.Clients
 {
@@ -12,6 +17,64 @@ namespace Volo.Abp.IdentityServer.Clients
                 .ConstructUsing(src => src.Origin)
                 .ReverseMap()
                 .ForMember(dest => dest.Origin, opt => opt.MapFrom(src => src));
+
+
+            CreateMap<ApiResource, IdentityServer4.Models.ApiResource>()
+                .ForMember(dest => dest.ApiSecrets, opt => opt.MapFrom(src => src.Secrets));
+
+
+            CreateMap<PersistedGrant, IdentityServer4.Models.PersistedGrant>();
+
+            CreateMap<IdentityResource, IdentityServer4.Models.IdentityResource>();
+
+            CreateMap<ApiSecret, IdentityServer4.Models.Secret>();
+
+            CreateMap<ApiScope, IdentityServer4.Models.Scope>();
+
+            CreateMap<ClientProperty, KeyValuePair<string, string>>()
+              .ReverseMap();
+
+            CreateMap<Client, IdentityServer4.Models.Client>()
+                .ForMember(dest => dest.ProtocolType, opt => opt.Condition(srs => srs != null))
+                .ReverseMap();
+
+            CreateMap<ClientCorsOrigin, string>()
+                .ConstructUsing(src => src.Origin)
+                .ReverseMap()
+                .ForMember(dest => dest.Origin, opt => opt.MapFrom(src => src));
+
+            CreateMap<ClientIdPRestriction, string>()
+                .ConstructUsing(src => src.Provider)
+                .ReverseMap()
+                .ForMember(dest => dest.Provider, opt => opt.MapFrom(src => src));
+
+            CreateMap<ClientClaim, Claim>(MemberList.None)
+                .ConstructUsing(src => new Claim(src.Type, src.Value))
+                .ReverseMap();
+
+            CreateMap<ClientScope, string>()
+                .ConstructUsing(src => src.Scope)
+                .ReverseMap()
+                .ForMember(dest => dest.Scope, opt => opt.MapFrom(src => src));
+
+            CreateMap<ClientPostLogoutRedirectUri, string>()
+                .ConstructUsing(src => src.PostLogoutRedirectUri)
+                .ReverseMap()
+                .ForMember(dest => dest.PostLogoutRedirectUri, opt => opt.MapFrom(src => src));
+
+            CreateMap<ClientRedirectUri, string>()
+                .ConstructUsing(src => src.RedirectUri)
+                .ReverseMap()
+                .ForMember(dest => dest.RedirectUri, opt => opt.MapFrom(src => src));
+
+            CreateMap<ClientGrantType, string>()
+                .ConstructUsing(src => src.GrantType)
+                .ReverseMap()
+                .ForMember(dest => dest.GrantType, opt => opt.MapFrom(src => src));
+
+            CreateMap<ClientSecret, IdentityServer4.Models.Secret>(MemberList.Destination)
+                .ForMember(dest => dest.Type, opt => opt.Condition(srs => srs != null))
+                .ReverseMap();
         }
     }
 }