diff --git a/Controllers/MigrationController.cs b/Controllers/MigrationController.cs
index 5ee9dc8..d94edbe 100644
--- a/Controllers/MigrationController.cs
+++ b/Controllers/MigrationController.cs
@@ -15,7 +15,7 @@ namespace CarCareTracker.Controllers
         private IConfigHelper _configHelper;
         private IFileHelper _fileHelper;
         private readonly ILogger<MigrationController> _logger;
-        public MigrationController(IConfigHelper configHelper, IFileHelper fileHelper, IConfiguration serverConfig, ILogger<MigrationController> logger)
+        public MigrationController(IConfigHelper configHelper, IFileHelper fileHelper, ILogger<MigrationController> logger)
         {
             _configHelper = configHelper;
             _fileHelper = fileHelper;
diff --git a/Helper/ConfigHelper.cs b/Helper/ConfigHelper.cs
index 54927bd..a22321d 100644
--- a/Helper/ConfigHelper.cs
+++ b/Helper/ConfigHelper.cs
@@ -10,6 +10,7 @@ namespace CarCareTracker.Helper
     {
         OpenIDConfig GetOpenIDConfig();
         ReminderUrgencyConfig GetReminderUrgencyConfig();
+        MailConfig GetMailConfig();
         UserConfig GetUserConfig(ClaimsPrincipal user);
         bool SaveUserConfig(ClaimsPrincipal user, UserConfig configData);
         bool AuthenticateRootUser(string username, string password);
@@ -65,6 +66,11 @@ namespace CarCareTracker.Helper
             ReminderUrgencyConfig reminderUrgencyConfig = _config.GetSection("ReminderUrgencyConfig").Get<ReminderUrgencyConfig>() ?? new ReminderUrgencyConfig();
             return reminderUrgencyConfig;
         }
+        public MailConfig GetMailConfig()
+        {
+            MailConfig mailConfig = _config.GetSection("MailConfig").Get<MailConfig>() ?? new MailConfig();
+            return mailConfig;
+        }
         public string GetLogoUrl()
         {
             var logoUrl = CheckString("LUBELOGGER_LOGO_URL", "/defaults/lubelogger_logo.png");
@@ -107,7 +113,7 @@ namespace CarCareTracker.Helper
         }
         public string GetServerPostgresConnection()
         {
-            var postgresConnection = CheckString("POSTGRES_CONNECTION")
+            var postgresConnection = CheckString("POSTGRES_CONNECTION");
             return postgresConnection;
         }
         public bool GetServerEnableShopSupplies()
diff --git a/Helper/MailHelper.cs b/Helper/MailHelper.cs
index 472311d..455727a 100644
--- a/Helper/MailHelper.cs
+++ b/Helper/MailHelper.cs
@@ -18,12 +18,12 @@ namespace CarCareTracker.Helper
         private readonly IFileHelper _fileHelper;
         private readonly ILogger<MailHelper> _logger;
         public MailHelper(
-            IConfiguration config,
+            IConfigHelper config,
             IFileHelper fileHelper,
             ILogger<MailHelper> logger
             ) {
             //load mailConfig from Configuration
-            mailConfig = config.GetSection("MailConfig").Get<MailConfig>() ?? new MailConfig();
+            mailConfig = config.GetMailConfig();
             _fileHelper = fileHelper;
             _logger = logger;
         }
diff --git a/Middleware/Authen.cs b/Middleware/Authen.cs
index ec05d97..e2d8758 100644
--- a/Middleware/Authen.cs
+++ b/Middleware/Authen.cs
@@ -28,7 +28,7 @@ namespace CarCareTracker.Middleware
             _httpContext = httpContext;
             _dataProtector = securityProvider.CreateProtector("login");
             _loginLogic = loginLogic;
-            enableAuth = bool.Parse(configuration["EnableAuth"]);
+            enableAuth = bool.Parse(configuration["EnableAuth"] ?? "false");
         }
         protected override async Task<AuthenticateResult> HandleAuthenticateAsync()
         {
diff --git a/Program.cs b/Program.cs
index 69aef1a..fb3d840 100644
--- a/Program.cs
+++ b/Program.cs
@@ -65,8 +65,8 @@ builder.Services.AddSingleton<IFileHelper, FileHelper>();
 builder.Services.AddSingleton<IGasHelper, GasHelper>();
 builder.Services.AddSingleton<IReminderHelper, ReminderHelper>();
 builder.Services.AddSingleton<IReportHelper, ReportHelper>();
-builder.Services.AddSingleton<IMailHelper, MailHelper>();
 builder.Services.AddSingleton<IConfigHelper, ConfigHelper>();
+builder.Services.AddSingleton<IMailHelper, MailHelper>();
 builder.Services.AddSingleton<ITranslationHelper, TranslationHelper>();
 
 //configure logic
diff --git a/Views/Admin/Index.cshtml b/Views/Admin/Index.cshtml
index 2095a0a..09d8308 100644
--- a/Views/Admin/Index.cshtml
+++ b/Views/Admin/Index.cshtml
@@ -2,12 +2,12 @@
 @{
     ViewData["Title"] = "Admin Panel";
 }
-@inject IConfiguration config;
+@inject IConfigHelper config
 @inject ITranslationHelper translator
 @{
     bool emailServerIsSetup = true;
-    var mailConfig = config.GetSection("MailConfig").Get<MailConfig>();
-    var userLanguage = config[nameof(UserConfig.UserLanguage)] ?? "en_US";
+    var mailConfig = config.GetMailConfig();
+    var userLanguage = config.GetServerLanguage();
     if (mailConfig is null || string.IsNullOrWhiteSpace(mailConfig.EmailServer))
     {
         emailServerIsSetup = false;
diff --git a/Views/Migration/Index.cshtml b/Views/Migration/Index.cshtml
index 02b37dc..14ab16f 100644
--- a/Views/Migration/Index.cshtml
+++ b/Views/Migration/Index.cshtml
@@ -1,10 +1,10 @@
 @{
     ViewData["Title"] = "Database Migration";
 }
-@inject IConfiguration config;
+@inject IConfigHelper config
 @inject ITranslationHelper translator
 @{
-    var userLanguage = config[nameof(UserConfig.UserLanguage)] ?? "en_US";
+    var userLanguage = config.GetServerLanguage();
 }
 @using CarCareTracker.Helper
 @model AdminViewModel