diff --git a/Icarus/Database/Contexts/UserContext.cs b/Icarus/Database/Contexts/UserContext.cs
index 3bb0cec..818ad3d 100644
--- a/Icarus/Database/Contexts/UserContext.cs
+++ b/Icarus/Database/Contexts/UserContext.cs
@@ -23,6 +23,14 @@ public class UserContext : DbContext
     {
         modelBuilder.Entity<User>()
             .ToTable("User");
+
+        modelBuilder.Entity<User>(entity =>
+{
+    entity.HasKey(e => e.Id);
+
+    entity.Property(e => e.Id)
+          .HasColumnType("binary(16)"); // **** Map Guid to BINARY(16) ****
+});
         modelBuilder.Entity<User>()
             .Property(u => u.LastLogin).IsRequired(false);
         modelBuilder.Entity<User>()
diff --git a/Models/LoginResult.cs b/Models/LoginResult.cs
index d8d4da7..bf7942a 100644
--- a/Models/LoginResult.cs
+++ b/Models/LoginResult.cs
@@ -6,7 +6,7 @@ public class LoginResult : BaseResult
 {
     #region Properties
     [JsonProperty("user_id")]
-    public int UserId { get; set; }
+    public Guid UserId { get; set; }
     [JsonProperty("username")]
     public string? Username { get; set; }
     [JsonProperty("token")]
diff --git a/Models/User.cs b/Models/User.cs
index 95182f4..b2d0721 100644
--- a/Models/User.cs
+++ b/Models/User.cs
@@ -12,7 +12,7 @@ public class User
     [JsonProperty("id")]
     [Column("Id")]
     [Key]
-    public int Id { get; set; }
+    public Guid Id { get; set; }
     [JsonProperty("username")]
     public string? Username { get; set; }
     [JsonProperty("password")]