diff --git a/GatewayAPI/Models/UserLogin.cs b/GatewayAPI/Models/UserLogin.cs
index 47ae2b3b7eea2c4f248314bec714506cc59dcc01..46a3f305e10d697a7ba1b220e7464c5d885689d9 100644
--- a/GatewayAPI/Models/UserLogin.cs
+++ b/GatewayAPI/Models/UserLogin.cs
@@ -2,7 +2,7 @@
 {
     public class UserLogin
     {
-        public required string Username { get; set; }
+        public required string Email { get; set; }
         public required string Password { get; set; }
 
     }
diff --git a/UserMicroservice/Controllers/UserController.cs b/UserMicroservice/Controllers/UserController.cs
index 68e4dd206e74a1c6b2c20932457160c24de445cc..889e1a3cf91b6aa95de08f32b86bca6a268ff8e9 100644
--- a/UserMicroservice/Controllers/UserController.cs
+++ b/UserMicroservice/Controllers/UserController.cs
@@ -71,7 +71,7 @@ namespace UserMicroservice.Controllers
         [HttpPost("login")]
         public IActionResult Login([FromBody] LoginModel model)
         {
-            User? user = _userService.GetUser(model.Username, model.Password);
+            User? user = _userService.GetUser(model.Email, model.Password);
             if(user == null)
                 return Unauthorized();
 
diff --git a/UserMicroservice/Models/LoginModel.cs b/UserMicroservice/Models/LoginModel.cs
index 961ae0596bea04d3b3c4de3fe42e0a0342084272..65d11d09a62a0fde47074f0c5a25c24380ea139d 100644
--- a/UserMicroservice/Models/LoginModel.cs
+++ b/UserMicroservice/Models/LoginModel.cs
@@ -2,7 +2,7 @@
 {
     public class LoginModel
     {
-        public required string Username { get; set; }
+        public required string Email { get; set; }
         public required string Password { get; set; }
     }
 }
diff --git a/UserMicroservice/Services/IUserService.cs b/UserMicroservice/Services/IUserService.cs
index 0e6deffc39d5b7b37e3778f0c96882df235b1878..518745a89537cb22647b2629f1d501d0df8a53c9 100644
--- a/UserMicroservice/Services/IUserService.cs
+++ b/UserMicroservice/Services/IUserService.cs
@@ -7,7 +7,7 @@ namespace UserMicroservice.Services
     {
         User? GetUser(string username);
         User? GetUser(int userId);
-        User? GetUser(string username, string password);
+        User? GetUser(string email, string password);
         List<User> GetUsers();
         User CreateUser(string email, string userName, string password, UserType UserType);
         void UpdateUser(int id, string? username, string? email, string? password);
diff --git a/UserMicroservice/Services/UserService.cs b/UserMicroservice/Services/UserService.cs
index 59c0f37697e912984c773e7ea882771b3a4e1030..21b50b0bab20e166793bb4ac6045c92b525ffb4d 100644
--- a/UserMicroservice/Services/UserService.cs
+++ b/UserMicroservice/Services/UserService.cs
@@ -45,9 +45,9 @@ namespace UserMicroservice.Services
             return user;
         }
 
-        public User? GetUser(string username, string password)
+        public User? GetUser(string email, string password)
         {
-            User? user = GetUser(username);
+            User? user = GetUserByEmail(email);
 
             if (user != null)
             {