diff --git a/OwnChar b/OwnChar
index 32708e3..38dc09a 160000
--- a/OwnChar
+++ b/OwnChar
@@ -1 +1 @@
-Subproject commit 32708e3e263cd6104d9d2faa465d575cfb0c264d
+Subproject commit 38dc09ab12dfc2e1d98dc15f6805373fc5e6e33b
diff --git a/OwnChar.Server/Api/Endpoint/Implementations/LoginApi.cs b/OwnChar.Server/Api/Endpoint/Implementations/LoginApi.cs
index c702638..f289213 100644
--- a/OwnChar.Server/Api/Endpoint/Implementations/LoginApi.cs
+++ b/OwnChar.Server/Api/Endpoint/Implementations/LoginApi.cs
@@ -1,6 +1,7 @@
 using Microsoft.AspNetCore.Mvc;
-using OwnChar.Api.Responses;
+using OwnChar.Base.Data.Responses;
 using OwnChar.Model;
+using OwnChar.Server.Data.Model;
 
 namespace OwnChar.ServerNew.Api.Endpoint.Implementations;
 
@@ -14,7 +15,7 @@ internal class LoginApi(ServerContext server) : IApiEndpoint
 
     private IResult Login(string username, [FromHeader(Name = "X-USER-PASSWORD")] string password)
     {
-        if (server.Data != null && server.Data.Set<UserAccount>()?.FirstOrDefault(n => n.Username == username && n.Password == password) is UserAccount account)
+        if (server.Data != null && server.Data.Set<UserAccountDb>()?.FirstOrDefault(n => n.Username == username && n.Password == password) is UserAccountBase account)
             return TypedResults.Ok(new LoginResponse
             {
                 Secret = server.Login(account),
diff --git a/OwnChar.Server/Api/IServer.cs b/OwnChar.Server/Api/IServer.cs
index 4306eca..9cd3b5d 100644
--- a/OwnChar.Server/Api/IServer.cs
+++ b/OwnChar.Server/Api/IServer.cs
@@ -19,5 +19,5 @@ public interface IServer
     bool IsLoggedIn(string secret);
 
     [MemberNotNullWhen(true, nameof(Data))]
-    UserAccount? GetUser(string secret);
+    UserAccountBase? GetUser(string secret);
 }
diff --git a/OwnChar.Server/ServerContext.cs b/OwnChar.Server/ServerContext.cs
index 7c09e49..5b26e74 100644
--- a/OwnChar.Server/ServerContext.cs
+++ b/OwnChar.Server/ServerContext.cs
@@ -15,7 +15,7 @@ namespace OwnChar.ServerNew;
 
 internal class ServerContext(ISettings settings) : Api.IServer
 {
-    private readonly Dictionary<string, UserAccount> users = [];
+    private readonly Dictionary<string, UserAccountBase> users = [];
 
     public DbContext? Data { get; private set; }
 
@@ -72,7 +72,7 @@ internal class ServerContext(ISettings settings) : Api.IServer
         app.Run();
     }
 
-    public string Login(UserAccount account)
+    public string Login(UserAccountBase account)
     {
         var secret = new UniquieID(UniquieIDGenerationMode.GenerateOnInit).ID;
         users.Add(secret, account);
@@ -99,10 +99,10 @@ internal class ServerContext(ISettings settings) : Api.IServer
             throw new UnauthorizedAccessException();
     }
 
-    public UserAccount? GetUser(string secret)
+    public UserAccountBase? GetUser(string secret)
     {
         Log.DebugFormat("Getting user with secret {0}", secret);
-        if (users.TryGetValue(secret, out UserAccount? value))
+        if (users.TryGetValue(secret, out UserAccountBase? value))
             return value;
         return null;
     }