diff --git a/TIAM.Database.Test/UserDalTests.cs b/TIAM.Database.Test/UserDalTests.cs
index 3dd34fae..8970ad54 100644
--- a/TIAM.Database.Test/UserDalTests.cs
+++ b/TIAM.Database.Test/UserDalTests.cs
@@ -13,11 +13,13 @@ using TIAM.Entities.Addresses;
 using TIAMWebApp.Server.Services.Logins;
 using AyCode.Interfaces.Users;
 using Microsoft.EntityFrameworkCore;
+using SendGrid.Helpers.Mail;
+using TIAM.Entities.Emails;
 
 namespace TIAM.Database.Test
 {
     [TestClass]
-    public class UserDalTests : AcUserDalTestBase<UserDal, UserDbContext, User, Profile, UserToken, TiamServiceProvider, UserToServiceProvider, Address>
+    public class UserDalTests : AcUserDalTestBase<UserDal, UserDbContext, User, Profile, UserToken, TiamServiceProvider, UserToServiceProvider, Address, EmailMessage>
     {
         private Guid _registerUserId = Guid.Parse("1f7e0591-330b-463b-81ad-d01f2e65e23e");
         private const string RegisterEmail = "qwerty@xxxxx.com";
@@ -134,9 +136,9 @@ namespace TIAM.Database.Test
 
         [TestMethod]
         [DataRow("test@tiam.hu")]
-        public void GetUserByEmail_ReturnsUser_WhenUserAndRelationsExists(string email)
+        public override void AcBase_GetUserByEmail_ReturnsUser_WhenUserExists(string email)
         {
-            var user = AcBase_GetUserByEmail_ReturnsUser_WhenUserExists(email);
+            var user = AcBase_GetUserByEmail(email);
 
             Assert.IsTrue(user.ServiceProviders.Count > 0);
             Assert.IsTrue(user.UserToServiceProviders.Count > 0);
diff --git a/TIAM.Database/DataLayers/Users/UserDal.cs b/TIAM.Database/DataLayers/Users/UserDal.cs
index cfbe2240..c0051901 100644
--- a/TIAM.Database/DataLayers/Users/UserDal.cs
+++ b/TIAM.Database/DataLayers/Users/UserDal.cs
@@ -11,6 +11,7 @@ using Microsoft.EntityFrameworkCore;
 using TIAM.Database.DbContexts.Users;
 using TIAM.Database.DbSets.Users;
 using TIAM.Entities.Addresses;
+using TIAM.Entities.Emails;
 using TIAM.Entities.Profiles;
 using TIAM.Entities.ServiceProviders;
 using TIAM.Entities.Users;
@@ -18,7 +19,7 @@ using TIAM.Models.Dtos.Users;
 
 namespace TIAM.Database.DataLayers.Users
 {
-    public class UserDal : AcUserDalBase<UserDbContext, User, Profile, UserToken, TiamServiceProvider, UserToServiceProvider, Address>, IDalBase<UserDbContext>
+    public class UserDal : AcUserDalBase<UserDbContext, User, Profile, UserToken, TiamServiceProvider, UserToServiceProvider, Address, EmailMessage>, IDalBase<UserDbContext>
     {
         
         public UserDal() : base()
diff --git a/TIAM.Database/DbContexts/Users/IUserDbContext.cs b/TIAM.Database/DbContexts/Users/IUserDbContext.cs
index d3bb81d2..3c768a37 100644
--- a/TIAM.Database/DbContexts/Users/IUserDbContext.cs
+++ b/TIAM.Database/DbContexts/Users/IUserDbContext.cs
@@ -5,6 +5,7 @@ using TIAM.Database.DbSets.Emails;
 using TIAM.Database.DbSets.Transfers;
 using TIAM.Database.DbSets.Users;
 using TIAM.Entities.Addresses;
+using TIAM.Entities.Emails;
 using TIAM.Entities.Profiles;
 using TIAM.Entities.ServiceProviders;
 using TIAM.Entities.Users;
@@ -12,5 +13,5 @@ using TIAM.Entities.Users;
 namespace TIAM.Database.DbContexts.Users;
 
 public interface IUserDbContext : 
-    IAcUserDbContextBase<User, Profile, UserToken, TiamServiceProvider, UserToServiceProvider, Address>, IUserDbSet, IAddressDbSet, ITransferDestinationDbSet, ITransferDbSet, IEmailMessageDbSet
+    IAcUserDbContextBase<User, Profile, UserToken, TiamServiceProvider, UserToServiceProvider, Address, EmailMessage>, IUserDbSet, IAddressDbSet, ITransferDestinationDbSet, ITransferDbSet, IEmailMessageDbSet
 { }
\ No newline at end of file
diff --git a/TIAM.Database/DbContexts/Users/UserDbContext.cs b/TIAM.Database/DbContexts/Users/UserDbContext.cs
index 3b99bf24..46d2c63a 100644
--- a/TIAM.Database/DbContexts/Users/UserDbContext.cs
+++ b/TIAM.Database/DbContexts/Users/UserDbContext.cs
@@ -21,24 +21,24 @@ using TIAM.Entities.Emails;
 using TIAM.Entities.Permissions;
 using TIAM.Entities.Products;
 using TIAM.Entities.Profiles;
+using TIAM.Entities.ServiceProviders;
 using TIAM.Entities.Transfers;
 using TIAM.Entities.Users;
 
 namespace TIAM.Database.DbContexts.Users
 {
     public class UserDbContext : DbContextBase, IUserDbContext
+        //AcUserDbContextBase<User, Profile, UserToken, TiamServiceProvider, UserToServiceProvider, Address, EmailMessage>, IUserDbContext
     {
         public DbSet<User> Users { get; set; }
         public DbSet<UserToken> UserTokens { get; set; }
-
-        public DbSet<Profile> Profiles { get; set; }
         public DbSet<Address> Addresses { get; set; }
+        public DbSet<Profile> Profiles { get; set; }
+        public DbSet<EmailMessage> EmailMessages { get; set; }
 
         public DbSet<Transfer> Transfers { get; set; }
         public DbSet<TransferDestinationToProduct> TransferDestinationToProducts { get; set; }
 
-        public DbSet<EmailMessage> EmailMessages { get; set; }
-
         public DbSet<TransferDestination> TransferDestinations { get; set; }
 
         public UserDbContext() //: this(string.Empty)
diff --git a/TIAMWebApp/Server/Services/Logins/LoginService.cs b/TIAMWebApp/Server/Services/Logins/LoginService.cs
index c103d464..0a8fd41f 100644
--- a/TIAMWebApp/Server/Services/Logins/LoginService.cs
+++ b/TIAMWebApp/Server/Services/Logins/LoginService.cs
@@ -9,6 +9,7 @@ using TIAM.Database.DataLayers.Users;
 using TIAM.Database.DbContexts.Admins;
 using TIAM.Database.DbContexts.Users;
 using TIAM.Entities.Addresses;
+using TIAM.Entities.Emails;
 using TIAM.Entities.Profiles;
 using TIAM.Entities.ServiceProviders;
 using TIAM.Entities.Users;
@@ -16,7 +17,7 @@ using TIAMWebApp.Server.Models.Logins;
 
 namespace TIAMWebApp.Server.Services.Logins;
 
-public class LoginService(UserDal userDal, IConfiguration configuration) : AcLoginServiceServer<LoggedInModel, UserDal, UserDbContext, User, UserToken, Profile, TiamServiceProvider, UserToServiceProvider, Address>(userDal, configuration), ILoginService
+public class LoginService(UserDal userDal, IConfiguration configuration) : AcLoginServiceServer<LoggedInModel, UserDal, UserDbContext, User, UserToken, Profile, TiamServiceProvider, UserToServiceProvider, Address, EmailMessage>(userDal, configuration), ILoginService
     
 {
     public override LoggedInModel Login(string? email, string? password)