diff --git a/Directory.Build.props b/Directory.Build.props
index 449fa1cf..8f8e38ba 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,7 +1,7 @@
 <Project>
 
   <PropertyGroup>    
-    <Version>2.4.0</Version>
+    <Version>2.5.0</Version>
     <Authors>Jan Škoruba</Authors>
     <PackageTags>Duende IdentityServer Admin OpenIDConnect OAuth2 Identity</PackageTags>
     <PackageLicenseUrl>https://github.com/skoruba/Duende.IdentityServer.Admin/blob/main/LICENSE</PackageLicenseUrl>
diff --git a/README.md b/README.md
index 86f92605..63851b1c 100644
--- a/README.md
+++ b/README.md
@@ -22,7 +22,7 @@ The application is written in the **Asp.Net Core MVC - using .NET 8.0**
 - 🔒 **NOTE:** The project uses the default database migrations which affect your database, therefore double check the migrations according to your database provider and create a database backup
 
 ```sh
-dotnet new install Skoruba.Duende.IdentityServer.Admin.Templates::2.4.0
+dotnet new install Skoruba.Duende.IdentityServer.Admin.Templates::2.5.0
 ```
 
 ### Create new project:
@@ -789,6 +789,10 @@ It is possible to define the configuration according the client type - by defaul
 - [x] Docker Compose NGINX targeting wrong port ([#222](https://github.com/skoruba/Duende.IdentityServer.Admin/issues/222))
 - [x] Update all nuget packages to the latest versions, including Duende IdentityServer version 7.0.7. (fixed [CVE-2024-39694](https://github.com/advisories/GHSA-ff4q-64jc-gx98)) - ([#236](https://github.com/skoruba/Duende.IdentityServer.Admin/issues/236))
 
+### 2.5.0
+
+- [x] Delete user from admin panel of admin app returns an error ([#214](https://github.com/skoruba/Duende.IdentityServer.Admin/issues/214))
+
 ### 3.0.0
 
 - [ ] New UI in React and Typescript ([#182](https://github.com/skoruba/Duende.IdentityServer.Admin/issues/182))
diff --git a/src/Skoruba.Duende.IdentityServer.Admin/Startup.cs b/src/Skoruba.Duende.IdentityServer.Admin/Startup.cs
index ebbd9893..26684cce 100644
--- a/src/Skoruba.Duende.IdentityServer.Admin/Startup.cs
+++ b/src/Skoruba.Duende.IdentityServer.Admin/Startup.cs
@@ -26,7 +26,7 @@ public class Startup
     {
         public Startup(IWebHostEnvironment env, IConfiguration configuration)
         {
-            JwtSecurityTokenHandler.DefaultInboundClaimTypeMap.Clear();
+            JwtSecurityTokenHandler.DefaultMapInboundClaims = false;
             HostingEnvironment = env;
             Configuration = configuration;
         }
diff --git a/templates/template-build/Skoruba.Duende.IdentityServer.Admin.Templates.nuspec b/templates/template-build/Skoruba.Duende.IdentityServer.Admin.Templates.nuspec
index 39f00c02..c33e3b07 100644
--- a/templates/template-build/Skoruba.Duende.IdentityServer.Admin.Templates.nuspec
+++ b/templates/template-build/Skoruba.Duende.IdentityServer.Admin.Templates.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata>
     <id>Skoruba.Duende.IdentityServer.Admin.Templates</id>
-    <version>2.4.0</version>
+    <version>2.5.0</version>
     <authors>Jan Škoruba</authors>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <licenseUrl>https://github.com/skoruba/Duende.IdentityServer.Admin/blob/master/LICENSE.md</licenseUrl>
diff --git a/templates/template-publish/Skoruba.Duende.IdentityServer.Admin.Templates.nuspec b/templates/template-publish/Skoruba.Duende.IdentityServer.Admin.Templates.nuspec
index 39f00c02..c33e3b07 100644
--- a/templates/template-publish/Skoruba.Duende.IdentityServer.Admin.Templates.nuspec
+++ b/templates/template-publish/Skoruba.Duende.IdentityServer.Admin.Templates.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata>
     <id>Skoruba.Duende.IdentityServer.Admin.Templates</id>
-    <version>2.4.0</version>
+    <version>2.5.0</version>
     <authors>Jan Škoruba</authors>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <licenseUrl>https://github.com/skoruba/Duende.IdentityServer.Admin/blob/master/LICENSE.md</licenseUrl>
diff --git a/templates/template-publish/content/src/SkorubaDuende.IdentityServerAdmin.Admin.Api/SkorubaDuende.IdentityServerAdmin.Admin.Api.csproj b/templates/template-publish/content/src/SkorubaDuende.IdentityServerAdmin.Admin.Api/SkorubaDuende.IdentityServerAdmin.Admin.Api.csproj
index 5e17cd99..a1870eba 100644
--- a/templates/template-publish/content/src/SkorubaDuende.IdentityServerAdmin.Admin.Api/SkorubaDuende.IdentityServerAdmin.Admin.Api.csproj
+++ b/templates/template-publish/content/src/SkorubaDuende.IdentityServerAdmin.Admin.Api/SkorubaDuende.IdentityServerAdmin.Admin.Api.csproj
@@ -28,7 +28,7 @@
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Skoruba.Duende.IdentityServer.Admin.UI.Api" Version="2.4.0" />
+        <PackageReference Include="Skoruba.Duende.IdentityServer.Admin.UI.Api" Version="2.5.0" />
     </ItemGroup>
     
     <Target Name="NSwag" BeforeTargets="AfterBuild" Condition="'$(Configuration)'=='Debug'">
diff --git a/templates/template-publish/content/src/SkorubaDuende.IdentityServerAdmin.Admin.EntityFramework.Shared/SkorubaDuende.IdentityServerAdmin.Admin.EntityFramework.Shared.csproj b/templates/template-publish/content/src/SkorubaDuende.IdentityServerAdmin.Admin.EntityFramework.Shared/SkorubaDuende.IdentityServerAdmin.Admin.EntityFramework.Shared.csproj
index edf7259c..f82a63a0 100644
--- a/templates/template-publish/content/src/SkorubaDuende.IdentityServerAdmin.Admin.EntityFramework.Shared/SkorubaDuende.IdentityServerAdmin.Admin.EntityFramework.Shared.csproj
+++ b/templates/template-publish/content/src/SkorubaDuende.IdentityServerAdmin.Admin.EntityFramework.Shared/SkorubaDuende.IdentityServerAdmin.Admin.EntityFramework.Shared.csproj
@@ -8,7 +8,7 @@
 	<ItemGroup>
 		<PackageReference Include="Microsoft.AspNetCore.DataProtection.EntityFrameworkCore" Version="8.0.8" />
 		<PackageReference Include="Skoruba.AuditLogging.EntityFramework" Version="2.0.0" />
-		<PackageReference Include="Skoruba.Duende.IdentityServer.Admin.EntityFramework.Configuration" Version="2.4.0" />
+		<PackageReference Include="Skoruba.Duende.IdentityServer.Admin.EntityFramework.Configuration" Version="2.5.0" />
 	</ItemGroup>
 </Project>
 
diff --git a/templates/template-publish/content/src/SkorubaDuende.IdentityServerAdmin.Admin/SkorubaDuende.IdentityServerAdmin.Admin.csproj b/templates/template-publish/content/src/SkorubaDuende.IdentityServerAdmin.Admin/SkorubaDuende.IdentityServerAdmin.Admin.csproj
index 52fef3a5..ba6a2560 100644
--- a/templates/template-publish/content/src/SkorubaDuende.IdentityServerAdmin.Admin/SkorubaDuende.IdentityServerAdmin.Admin.csproj
+++ b/templates/template-publish/content/src/SkorubaDuende.IdentityServerAdmin.Admin/SkorubaDuende.IdentityServerAdmin.Admin.csproj
@@ -34,9 +34,9 @@
 		<PackageReference Include="Serilog.Sinks.File" Version="6.0.0" />
 		<PackageReference Include="Serilog.Sinks.MSSqlServer" Version="7.0.1" />
 		<PackageReference Include="Serilog.Sinks.Seq" Version="8.0.0" />
-		<PackageReference Include="Skoruba.Duende.IdentityServer.Admin.BusinessLogic" Version="2.4.0" />
-		<PackageReference Include="Skoruba.Duende.IdentityServer.Admin.BusinessLogic.Identity" Version="2.4.0" />
-		<PackageReference Include="Skoruba.Duende.IdentityServer.Admin.UI" Version="2.4.0" />
+		<PackageReference Include="Skoruba.Duende.IdentityServer.Admin.BusinessLogic" Version="2.5.0" />
+		<PackageReference Include="Skoruba.Duende.IdentityServer.Admin.BusinessLogic.Identity" Version="2.5.0" />
+		<PackageReference Include="Skoruba.Duende.IdentityServer.Admin.UI" Version="2.5.0" />
 	</ItemGroup>
 
 	<ItemGroup>
diff --git a/templates/template-publish/content/src/SkorubaDuende.IdentityServerAdmin.Admin/Startup.cs b/templates/template-publish/content/src/SkorubaDuende.IdentityServerAdmin.Admin/Startup.cs
index 970853aa..d9d359cc 100644
--- a/templates/template-publish/content/src/SkorubaDuende.IdentityServerAdmin.Admin/Startup.cs
+++ b/templates/template-publish/content/src/SkorubaDuende.IdentityServerAdmin.Admin/Startup.cs
@@ -26,7 +26,7 @@ public class Startup
     {
         public Startup(IWebHostEnvironment env, IConfiguration configuration)
         {
-            JwtSecurityTokenHandler.DefaultInboundClaimTypeMap.Clear();
+            JwtSecurityTokenHandler.DefaultMapInboundClaims = false;
             HostingEnvironment = env;
             Configuration = configuration;
         }
diff --git a/templates/template-publish/content/src/SkorubaDuende.IdentityServerAdmin.STS.Identity/SkorubaDuende.IdentityServerAdmin.STS.Identity.csproj b/templates/template-publish/content/src/SkorubaDuende.IdentityServerAdmin.STS.Identity/SkorubaDuende.IdentityServerAdmin.STS.Identity.csproj
index 6a7abcd2..76119410 100644
--- a/templates/template-publish/content/src/SkorubaDuende.IdentityServerAdmin.STS.Identity/SkorubaDuende.IdentityServerAdmin.STS.Identity.csproj
+++ b/templates/template-publish/content/src/SkorubaDuende.IdentityServerAdmin.STS.Identity/SkorubaDuende.IdentityServerAdmin.STS.Identity.csproj
@@ -43,8 +43,8 @@
 		<PackageReference Include="Serilog.Sinks.Seq" Version="8.0.0" />
 		<PackageReference Include="Skoruba.AuditLogging.EntityFramework" Version="2.0.0" />
 		<PackageReference Include="NWebsec.AspNetCore.Middleware" Version="3.0.0" />
-		<PackageReference Include="Skoruba.Duende.IdentityServer.Admin.EntityFramework.Configuration" Version="2.4.0" />
-		<PackageReference Include="Skoruba.Duende.IdentityServer.Shared.Configuration" Version="2.4.0" />
+		<PackageReference Include="Skoruba.Duende.IdentityServer.Admin.EntityFramework.Configuration" Version="2.5.0" />
+		<PackageReference Include="Skoruba.Duende.IdentityServer.Shared.Configuration" Version="2.5.0" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/templates/template-publish/content/src/SkorubaDuende.IdentityServerAdmin.Shared/SkorubaDuende.IdentityServerAdmin.Shared.csproj b/templates/template-publish/content/src/SkorubaDuende.IdentityServerAdmin.Shared/SkorubaDuende.IdentityServerAdmin.Shared.csproj
index 33667359..500104f8 100644
--- a/templates/template-publish/content/src/SkorubaDuende.IdentityServerAdmin.Shared/SkorubaDuende.IdentityServerAdmin.Shared.csproj
+++ b/templates/template-publish/content/src/SkorubaDuende.IdentityServerAdmin.Shared/SkorubaDuende.IdentityServerAdmin.Shared.csproj
@@ -13,7 +13,7 @@
 		<PackageReference Include="Microsoft.AspNetCore.DataProtection.EntityFrameworkCore" Version="8.0.8" />
 		<PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="8.0.8" />
 		<PackageReference Include="Sendgrid" Version="9.29.3" />
-		<PackageReference Include="Skoruba.Duende.IdentityServer.Admin.BusinessLogic.Identity" Version="2.4.0" />
+		<PackageReference Include="Skoruba.Duende.IdentityServer.Admin.BusinessLogic.Identity" Version="2.5.0" />
 	</ItemGroup>
 
 </Project>