diff --git a/src/DigitalData.Auth.API/Config/AuthApiParams.cs b/src/DigitalData.Auth.API/Config/AuthApiParams.cs
index 5cfdc74..a5e1076 100644
--- a/src/DigitalData.Auth.API/Config/AuthApiParams.cs
+++ b/src/DigitalData.Auth.API/Config/AuthApiParams.cs
@@ -1,4 +1,6 @@
-namespace DigitalData.Auth.API.Config
+using DigitalData.Auth.API.Entities;
+
+namespace DigitalData.Auth.API.Config
 {
     public class AuthApiParams
     {
diff --git a/src/DigitalData.Auth.API/Controllers/AuthController.cs b/src/DigitalData.Auth.API/Controllers/AuthController.cs
index d15646b..1c3b8c0 100644
--- a/src/DigitalData.Auth.API/Controllers/AuthController.cs
+++ b/src/DigitalData.Auth.API/Controllers/AuthController.cs
@@ -74,7 +74,7 @@ namespace DigitalData.Auth.API.Controllers
 
         private async Task<IActionResult> CreateTokenAsync(ConsumerLogin login, bool cookie = true)
         {
-            var api = await _consumerService.ReadByIdAsync(login.Id);
+            var api = await _consumerService.ReadByNameAsync(login.Name);
 
             if (api is null || api.Password != login.Password)
                 return Unauthorized();
diff --git a/src/DigitalData.Auth.API/Entities/Consumer.cs b/src/DigitalData.Auth.API/Entities/Consumer.cs
index 524371e..16f830d 100644
--- a/src/DigitalData.Auth.API/Entities/Consumer.cs
+++ b/src/DigitalData.Auth.API/Entities/Consumer.cs
@@ -1,4 +1,7 @@
 namespace DigitalData.Auth.API.Entities
 {
-    public record Consumer(int Id, string Name, string Password, string Audience);
+    public record Consumer(int Id, string Name, string Password, string Audience)
+    {
+        public CookieOptionsProvider? CookieOptions { get; set; }
+    }
 }
\ No newline at end of file
diff --git a/src/DigitalData.Auth.API/Config/CookieOptionsProvider.cs b/src/DigitalData.Auth.API/Entities/CookieOptionsProvider.cs
similarity index 98%
rename from src/DigitalData.Auth.API/Config/CookieOptionsProvider.cs
rename to src/DigitalData.Auth.API/Entities/CookieOptionsProvider.cs
index 1b6ab56..d53811d 100644
--- a/src/DigitalData.Auth.API/Config/CookieOptionsProvider.cs
+++ b/src/DigitalData.Auth.API/Entities/CookieOptionsProvider.cs
@@ -1,4 +1,4 @@
-namespace DigitalData.Auth.API.Config
+namespace DigitalData.Auth.API.Entities
 {
     public class CookieOptionsProvider
     {