diff --git a/EnvelopeGenerator.Application/Extensions/DIExtensions.cs b/EnvelopeGenerator.Application/DependencyInjection.cs
similarity index 92%
rename from EnvelopeGenerator.Application/Extensions/DIExtensions.cs
rename to EnvelopeGenerator.Application/DependencyInjection.cs
index a127afc4..0d96155c 100644
--- a/EnvelopeGenerator.Application/Extensions/DIExtensions.cs
+++ b/EnvelopeGenerator.Application/DependencyInjection.cs
@@ -1,6 +1,4 @@
-using DigitalData.UserManager.Application.MappingProfiles;
-using EnvelopeGenerator.Application.MappingProfiles;
-using EnvelopeGenerator.Application.Configurations;
+using EnvelopeGenerator.Application.Configurations;
 using EnvelopeGenerator.Application.Services;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
@@ -10,12 +8,12 @@ using QRCoder;
 using EnvelopeGenerator.Application.Contracts.Services;
 using System.Reflection;
 
-namespace EnvelopeGenerator.Application.Extensions;
+namespace EnvelopeGenerator.Application;
 
 /// <summary>
 /// Extensions method for dependency injection
 /// </summary>
-public static class DIExtensions
+public static class DependencyInjection
 {
     /// <summary>
     /// Adds all required services for envelope generator application
@@ -43,6 +41,7 @@ public static class DIExtensions
 
         //Auto mapping profiles
         services.AddAutoMapper(Assembly.GetExecutingAssembly());
+        services.AddAutoMapper(typeof(DigitalData.UserManager.Application.DIExtensions));
 
         services.Configure<DispatcherParams>(config.GetSection(nameof(DispatcherParams)));
         services.Configure<MailParams>(config.GetSection(nameof(MailParams)));
diff --git a/EnvelopeGenerator.GeneratorAPI/Program.cs b/EnvelopeGenerator.GeneratorAPI/Program.cs
index c55e3b7a..77ee0bab 100644
--- a/EnvelopeGenerator.GeneratorAPI/Program.cs
+++ b/EnvelopeGenerator.GeneratorAPI/Program.cs
@@ -1,7 +1,6 @@
 using DigitalData.Core.API;
 using DigitalData.Core.Application;
 using DigitalData.UserManager.Application;
-using EnvelopeGenerator.Application.Extensions;
 using EnvelopeGenerator.Infrastructure;
 using Microsoft.AspNetCore.Authentication.Cookies;
 using Microsoft.AspNetCore.Localization;
@@ -10,6 +9,7 @@ using System.Globalization;
 using Scalar.AspNetCore;
 using Microsoft.OpenApi.Models;
 using DigitalData.UserManager.DependencyInjection;
+using EnvelopeGenerator.Application;
 
 var builder = WebApplication.CreateBuilder(args);
 
diff --git a/EnvelopeGenerator.Terminal/DependencyInjection.cs b/EnvelopeGenerator.Terminal/DependencyInjection.cs
index f4161e04..ad011146 100644
--- a/EnvelopeGenerator.Terminal/DependencyInjection.cs
+++ b/EnvelopeGenerator.Terminal/DependencyInjection.cs
@@ -3,12 +3,12 @@ using CommandDotNet;
 using Microsoft.Extensions.DependencyInjection;
 using CommandDotNet.IoC.MicrosoftDependencyInjection;
 using EnvelopeGenerator.Infrastructure;
-using EnvelopeGenerator.Application.Extensions;
 using Microsoft.Extensions.Configuration;
 using Microsoft.EntityFrameworkCore;
 using EnvelopeGenerator.Application.Contracts.Services;
 using EnvelopeGenerator.Application.Services;
 using Microsoft.Extensions.Hosting;
+using EnvelopeGenerator.Application;
 
 namespace EnvelopeGenerator.Terminal;
 
diff --git a/EnvelopeGenerator.Tests.Application/Mock.cs b/EnvelopeGenerator.Tests.Application/Mock.cs
index a9cc42d6..10bc7ea6 100644
--- a/EnvelopeGenerator.Tests.Application/Mock.cs
+++ b/EnvelopeGenerator.Tests.Application/Mock.cs
@@ -1,10 +1,10 @@
 using Microsoft.Extensions.Hosting;
-using EnvelopeGenerator.Application.Extensions;
 using EnvelopeGenerator.Infrastructure;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using EnvelopeGenerator.Application.Services;
 using Microsoft.EntityFrameworkCore;
+using EnvelopeGenerator.Application;
 
 namespace EnvelopeGenerator.Tests.Application;
 
diff --git a/EnvelopeGenerator.Web/Program.cs b/EnvelopeGenerator.Web/Program.cs
index 96fcec96..8a2f7fc1 100644
--- a/EnvelopeGenerator.Web/Program.cs
+++ b/EnvelopeGenerator.Web/Program.cs
@@ -15,7 +15,6 @@ using DigitalData.EmailProfilerDispatcher;
 using EnvelopeGenerator.Infrastructure;
 using EnvelopeGenerator.Web.Sanitizers;
 using EnvelopeGenerator.Application.Contracts.Services;
-using EnvelopeGenerator.Application.Extensions;
 
 var logger = LogManager.Setup().LoadConfigurationFromAppSettings().GetCurrentClassLogger();
 logger.Info("Logging initialized!");