diff --git a/DigitalData.UserManager.API/DigitalData.UserManager.API.csproj b/DigitalData.UserManager.API/DigitalData.UserManager.API.csproj
index 292e356..45cb749 100644
--- a/DigitalData.UserManager.API/DigitalData.UserManager.API.csproj
+++ b/DigitalData.UserManager.API/DigitalData.UserManager.API.csproj
@@ -40,6 +40,7 @@
   <ItemGroup>
     <PackageReference Include="DigitalData.Core.API" Version="2.0.0" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.14" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.20" />
     <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="7.0.4" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.16" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.15">
@@ -48,6 +49,7 @@
     </PackageReference>
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.15" />
     <PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="7.0.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="NLog" Version="5.3.2" />
     <PackageReference Include="NLog.Web.AspNetCore" Version="5.3.11" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0" />
diff --git a/DigitalData.UserManager.API/Program.cs b/DigitalData.UserManager.API/Program.cs
index eef8e0b..f6bdbef 100644
--- a/DigitalData.UserManager.API/Program.cs
+++ b/DigitalData.UserManager.API/Program.cs
@@ -9,6 +9,7 @@ using DigitalData.Core.API;
 using DigitalData.UserManager.API.Controllers;
 using DigitalData.UserManager.Application.Services;
 using Microsoft.Data.SqlClient;
+using Newtonsoft.Json;
 
 var logger = LogManager.Setup().LoadConfigurationFromAppSettings().GetCurrentClassLogger();
 logger.Debug("init main");
@@ -25,8 +26,16 @@ try {
 
     builder.Logging.ClearProviders();
     builder.Host.UseNLog();
- 
-    builder.Services.AddControllers();
+
+    builder.Services.AddControllers(opt =>
+    {
+        opt.Conventions.Add(new RemoveIfControllerConvention()
+            .AndIf(c => c.ControllerName == nameof(EncryptionController).Replace("Controller", ""))
+            .AndIf(c => !config.GetValue<bool>("UseEncryptor")));
+    }).AddNewtonsoftJson(options =>
+    {
+        options.SerializerSettings.DateTimeZoneHandling = DateTimeZoneHandling.Utc;
+    });
 
     if (builder.Configuration.GetValue<bool>("UseSwagger"))
     {