diff --git a/EnvelopeGenerator.GeneratorAPI/.config/dotnet-tools.json b/EnvelopeGenerator.GeneratorAPI/.config/dotnet-tools.json
new file mode 100644
index 00000000..0280531d
--- /dev/null
+++ b/EnvelopeGenerator.GeneratorAPI/.config/dotnet-tools.json
@@ -0,0 +1,13 @@
+{
+  "version": 1,
+  "isRoot": true,
+  "tools": {
+    "dotnet-ef": {
+      "version": "9.0.3",
+      "commands": [
+        "dotnet-ef"
+      ],
+      "rollForward": false
+    }
+  }
+}
\ No newline at end of file
diff --git a/EnvelopeGenerator.GeneratorAPI/Controllers/AuthController.cs b/EnvelopeGenerator.GeneratorAPI/Controllers/AuthController.cs
index 129ea20d..9c84ddbe 100644
--- a/EnvelopeGenerator.GeneratorAPI/Controllers/AuthController.cs
+++ b/EnvelopeGenerator.GeneratorAPI/Controllers/AuthController.cs
@@ -63,10 +63,6 @@ namespace EnvelopeGenerator.GeneratorAPI.Controllers
         {
             try
             {
-                return Ok();
-
-                throw new NotImplementedException("JWT and cookie option is not implemented");
-
                 bool isValid = _dirSearchService.ValidateCredentials(login.Username, login.Password);
 
                 if (!isValid)
diff --git a/EnvelopeGenerator.GeneratorAPI/Program.cs b/EnvelopeGenerator.GeneratorAPI/Program.cs
index 3638047f..a5d1b05a 100644
--- a/EnvelopeGenerator.GeneratorAPI/Program.cs
+++ b/EnvelopeGenerator.GeneratorAPI/Program.cs
@@ -89,7 +89,7 @@ var app = builder.Build();
 app.MapOpenApi();
 
 // Configure the HTTP request pipeline.
-if (app.Environment.IsDevelopment())
+if (app.Environment.IsDevelopment() || (app.IsDevOrDiP() && config.GetValue<bool>("UseSwagger")))
 {
 	app.UseSwagger();
 	app.UseSwaggerUI();
diff --git a/EnvelopeGenerator.GeneratorAPI/appsettings.json b/EnvelopeGenerator.GeneratorAPI/appsettings.json
index 0f469f84..734a3dcb 100644
--- a/EnvelopeGenerator.GeneratorAPI/appsettings.json
+++ b/EnvelopeGenerator.GeneratorAPI/appsettings.json
@@ -1,4 +1,6 @@
 {
+  "UseSwagger": true,
+  "DiPMode": true,
   "Logging": {
     "LogLevel": {
       "Default": "Information",