diff --git a/DAL/Contexts/SASGContext.cs b/DAL/Contexts/SASGContext.cs
index 8824167..c55de12 100644
--- a/DAL/Contexts/SASGContext.cs
+++ b/DAL/Contexts/SASGContext.cs
@@ -94,43 +94,43 @@ namespace DAL.Contexts
 			builder.Entity<AuditColor>(entity =>
 			{
 				entity.HasOne<Color>().WithMany(e => e.audits)
-					.HasForeignKey(e => e.id).IsRequired();
+					.HasForeignKey(e => e.originalId).IsRequired();
 			});
 
 			builder.Entity<AuditEvent>(entity =>
 			{
 				entity.HasOne<Event>().WithMany(e => e.audits)
-					.HasForeignKey(e => e.id).IsRequired();
+					.HasForeignKey(e => e.originalId).IsRequired();
 			});
 
 			builder.Entity<AuditGrant>(entity =>
 			{
 				entity.HasOne<Grant>().WithMany(e => e.audits)
-					.HasForeignKey(e => e.id).IsRequired();
+					.HasForeignKey(e => e.originalId).IsRequired();
 			});
 
 			builder.Entity<AuditImage>(entity =>
 			{
 				entity.HasOne<Image>().WithMany(e => e.audits)
-					.HasForeignKey(e => e.id).IsRequired();
+					.HasForeignKey(e => e.originalId).IsRequired();
 			});
 
 			builder.Entity<AuditPermission>(entity =>
 			{
 				entity.HasOne<Permission>().WithMany(e => e.audits)
-					.HasForeignKey(e => e.id).IsRequired();
+					.HasForeignKey(e => e.originalId).IsRequired();
 			});
 
 			builder.Entity<AuditSavedEvent>(entity =>
 			{
 				entity.HasOne<SavedEvent>().WithMany(e => e.audits)
-					.HasForeignKey(e => e.id).IsRequired();
+					.HasForeignKey(e => e.originalId).IsRequired();
 			});
 
 			builder.Entity<AuditUser>(entity =>
 			{
 				entity.HasOne<User>().WithMany(e => e.audits)
-					.HasForeignKey(e => e.id).IsRequired();
+					.HasForeignKey(e => e.originalId).IsRequired();
 			});
 		}
 	}
diff --git a/DAL/Models/Audits/AuditColor.cs b/DAL/Models/Audits/AuditColor.cs
index 709199c..97f9458 100644
--- a/DAL/Models/Audits/AuditColor.cs
+++ b/DAL/Models/Audits/AuditColor.cs
@@ -6,7 +6,6 @@ namespace DAL.Models.Audits
 {
 	[Index("id", Name = "audit_colors_colors_id_fk")]
 	[Table("audit_colors")]
-	[Keyless]
 	public class AuditColor : AuditModel<Color>
 	{
 		[Column("red")]
@@ -26,7 +25,7 @@ namespace DAL.Models.Audits
 		{
 			return new Color
 			{
-				id = id,
+				id = originalId,
 				red = red,
 				blue = blue,
 				green = green,
diff --git a/DAL/Models/Audits/AuditEvent.cs b/DAL/Models/Audits/AuditEvent.cs
index 65b796a..fcfe5d5 100644
--- a/DAL/Models/Audits/AuditEvent.cs
+++ b/DAL/Models/Audits/AuditEvent.cs
@@ -6,7 +6,6 @@ namespace DAL.Models.Audits
 {
 	[Table("audit_event")]
 	[Index("id", Name = "audit_events_events_id_fk")]
-	[Keyless]
 	public class AuditEvent : AuditModel<Event>
 	{
 		[Column("savedEventId")]
@@ -32,7 +31,7 @@ namespace DAL.Models.Audits
 		{
 			return new Event
 			{
-				id = id,
+				id = originalId,
 				savedEventId = savedEventId,
 				name = name,
 				bgColorId = bgColorId,
diff --git a/DAL/Models/Audits/AuditGrant.cs b/DAL/Models/Audits/AuditGrant.cs
index 890a440..bfd6c17 100644
--- a/DAL/Models/Audits/AuditGrant.cs
+++ b/DAL/Models/Audits/AuditGrant.cs
@@ -6,7 +6,6 @@ namespace DAL.Models.Audits
 {
 	[Table("audit_grants")]
 	[Index("id", Name = "audit_grants_grants_id_fk")]
-	[Keyless]
 	public class AuditGrant : AuditModel<Grant>
 	{
 		[Column("name")]
@@ -20,7 +19,7 @@ namespace DAL.Models.Audits
 		{
 			return new Grant
 			{
-				id = id,
+				id = originalId,
 				name = name,
 				permissionId = permissionId,
 				updated = updated,
diff --git a/DAL/Models/Audits/AuditImage.cs b/DAL/Models/Audits/AuditImage.cs
index e2580b5..e6e34d0 100644
--- a/DAL/Models/Audits/AuditImage.cs
+++ b/DAL/Models/Audits/AuditImage.cs
@@ -6,7 +6,6 @@ namespace DAL.Models.Audits
 {
 	[Table("audit_images")]
 	[Index("id", Name = "audit_images_images_id_fk")]
-	[Keyless]
 	public class AuditImage : AuditModel<Image>
 	{
 		[Column("name")]
@@ -21,7 +20,7 @@ namespace DAL.Models.Audits
 		{
 			return new Image
 			{
-				id = id,
+				id = originalId,
 				name = name,
 				filename = filename,
 				updated = updated,
diff --git a/DAL/Models/Audits/AuditModel.cs b/DAL/Models/Audits/AuditModel.cs
index 65139fc..7f3ff40 100644
--- a/DAL/Models/Audits/AuditModel.cs
+++ b/DAL/Models/Audits/AuditModel.cs
@@ -5,9 +5,13 @@ namespace DAL.Models.Audits
 {
 	public abstract class AuditModel<TModel>
 	{
+		[Key]
 		[Column("id")]
 		public ulong id { get; set; }
 
+		[Column("originalId")]
+		public ulong originalId { get; set; }
+
 		[Column("updated")]
 		[DataType("datetime")]
 		public DateTime updated { get; set; }
diff --git a/DAL/Models/Audits/AuditPermission.cs b/DAL/Models/Audits/AuditPermission.cs
index f6fdce7..62a68de 100644
--- a/DAL/Models/Audits/AuditPermission.cs
+++ b/DAL/Models/Audits/AuditPermission.cs
@@ -6,7 +6,6 @@ namespace DAL.Models.Audits
 {
 	[Table("audit_permissions")]
 	[Index("id", Name = "audit_permissions_permissions_id_fk")]
-	[Keyless]
 	public class AuditPermission : AuditModel<Permission>
 	{
 		[Column("name")]
@@ -17,7 +16,7 @@ namespace DAL.Models.Audits
 		{
 			return new Permission
 			{
-				id = id,
+				id = originalId,
 				name = name,
 				updated = updated,
 				updater = updater
diff --git a/DAL/Models/Audits/AuditSavedEvent.cs b/DAL/Models/Audits/AuditSavedEvent.cs
index 4b17dec..52e6b97 100644
--- a/DAL/Models/Audits/AuditSavedEvent.cs
+++ b/DAL/Models/Audits/AuditSavedEvent.cs
@@ -6,7 +6,6 @@ namespace DAL.Models.Audits
 {
 	[Table("audit_savedEvents")]
 	[Index("id", Name = "audit_savedEvents_savedEvents_id_fk")]
-	[Keyless]
 	public class AuditSavedEvent : AuditModel<SavedEvent>
 	{
 		[Column("name")]
@@ -26,7 +25,7 @@ namespace DAL.Models.Audits
 		{
 			return new SavedEvent
 			{
-				id = id,
+				id = originalId,
 				name = name,
 				bgColorId = bgColorId,
 				fgColorId = fgColorId,
diff --git a/DAL/Models/Audits/AuditUser.cs b/DAL/Models/Audits/AuditUser.cs
index c3c31c9..6e78dd8 100644
--- a/DAL/Models/Audits/AuditUser.cs
+++ b/DAL/Models/Audits/AuditUser.cs
@@ -6,7 +6,6 @@ namespace DAL.Models.Audits
 {
 	[Table("audit_users")]
 	[Index("id", Name = "audit_users_users_id_fk")]
-	[Keyless]
 	public class AuditUser : AuditModel<User>
 	{
 		[Column("firstName")]
@@ -31,7 +30,7 @@ namespace DAL.Models.Audits
 		{
 			return new User
 			{
-				id = id,
+				id = originalId,
 				firstName = firstName,
 				lastName = lastName,
 				phoneNumber = phoneNumber,