diff --git a/Server/Migrations/20200325144430_Alerts.Designer.cs b/Server/Migrations/20200325145606_Alerts.Designer.cs
similarity index 98%
rename from Server/Migrations/20200325144430_Alerts.Designer.cs
rename to Server/Migrations/20200325145606_Alerts.Designer.cs
index d0534183..de88e810 100644
--- a/Server/Migrations/20200325144430_Alerts.Designer.cs
+++ b/Server/Migrations/20200325145606_Alerts.Designer.cs
@@ -9,7 +9,7 @@ using Remotely.Server.Data;
 namespace Remotely.Server.Migrations
 {
     [DbContext(typeof(ApplicationDbContext))]
-    [Migration("20200325144430_Alerts")]
+    [Migration("20200325145606_Alerts")]
     partial class Alerts
     {
         protected override void BuildTargetModel(ModelBuilder modelBuilder)
@@ -238,10 +238,7 @@ namespace Remotely.Server.Migrations
                     b.Property<string>("OrganizationID")
                         .HasColumnType("TEXT");
 
-                    b.Property<string>("UserIDId")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("UserId")
+                    b.Property<string>("UserID")
                         .HasColumnType("TEXT");
 
                     b.HasKey("ID");
@@ -250,9 +247,7 @@ namespace Remotely.Server.Migrations
 
                     b.HasIndex("OrganizationID");
 
-                    b.HasIndex("UserIDId");
-
-                    b.HasIndex("UserId");
+                    b.HasIndex("UserID");
 
                     b.ToTable("Alerts");
                 });
@@ -633,13 +628,9 @@ namespace Remotely.Server.Migrations
                         .WithMany("Alerts")
                         .HasForeignKey("OrganizationID");
 
-                    b.HasOne("Remotely.Shared.Models.RemotelyUser", "UserID")
-                        .WithMany()
-                        .HasForeignKey("UserIDId");
-
                     b.HasOne("Remotely.Shared.Models.RemotelyUser", "User")
                         .WithMany("Alerts")
-                        .HasForeignKey("UserId");
+                        .HasForeignKey("UserID");
                 });
 
             modelBuilder.Entity("Remotely.Shared.Models.ApiToken", b =>
diff --git a/Server/Migrations/20200325144430_Alerts.cs b/Server/Migrations/20200325145606_Alerts.cs
similarity index 74%
rename from Server/Migrations/20200325144430_Alerts.cs
rename to Server/Migrations/20200325145606_Alerts.cs
index faf097c0..569b8f68 100644
--- a/Server/Migrations/20200325144430_Alerts.cs
+++ b/Server/Migrations/20200325145606_Alerts.cs
@@ -15,8 +15,7 @@ namespace Remotely.Server.Migrations
                     DeviceID = table.Column<string>(nullable: true),
                     Message = table.Column<string>(nullable: true),
                     OrganizationID = table.Column<string>(nullable: true),
-                    UserId = table.Column<string>(nullable: true),
-                    UserIDId = table.Column<string>(nullable: true)
+                    UserID = table.Column<string>(nullable: true)
                 },
                 constraints: table =>
                 {
@@ -34,14 +33,8 @@ namespace Remotely.Server.Migrations
                         principalColumn: "ID",
                         onDelete: ReferentialAction.Restrict);
                     table.ForeignKey(
-                        name: "FK_Alerts_RemotelyUsers_UserIDId",
-                        column: x => x.UserIDId,
-                        principalTable: "RemotelyUsers",
-                        principalColumn: "Id",
-                        onDelete: ReferentialAction.Restrict);
-                    table.ForeignKey(
-                        name: "FK_Alerts_RemotelyUsers_UserId",
-                        column: x => x.UserId,
+                        name: "FK_Alerts_RemotelyUsers_UserID",
+                        column: x => x.UserID,
                         principalTable: "RemotelyUsers",
                         principalColumn: "Id",
                         onDelete: ReferentialAction.Restrict);
@@ -58,14 +51,9 @@ namespace Remotely.Server.Migrations
                 column: "OrganizationID");
 
             migrationBuilder.CreateIndex(
-                name: "IX_Alerts_UserIDId",
+                name: "IX_Alerts_UserID",
                 table: "Alerts",
-                column: "UserIDId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_Alerts_UserId",
-                table: "Alerts",
-                column: "UserId");
+                column: "UserID");
         }
 
         protected override void Down(MigrationBuilder migrationBuilder)
diff --git a/Server/Migrations/ApplicationDbContextModelSnapshot.cs b/Server/Migrations/ApplicationDbContextModelSnapshot.cs
index 1a3d4c02..fd828d39 100644
--- a/Server/Migrations/ApplicationDbContextModelSnapshot.cs
+++ b/Server/Migrations/ApplicationDbContextModelSnapshot.cs
@@ -236,10 +236,7 @@ namespace Remotely.Server.Migrations
                     b.Property<string>("OrganizationID")
                         .HasColumnType("TEXT");
 
-                    b.Property<string>("UserIDId")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("UserId")
+                    b.Property<string>("UserID")
                         .HasColumnType("TEXT");
 
                     b.HasKey("ID");
@@ -248,9 +245,7 @@ namespace Remotely.Server.Migrations
 
                     b.HasIndex("OrganizationID");
 
-                    b.HasIndex("UserIDId");
-
-                    b.HasIndex("UserId");
+                    b.HasIndex("UserID");
 
                     b.ToTable("Alerts");
                 });
@@ -631,13 +626,9 @@ namespace Remotely.Server.Migrations
                         .WithMany("Alerts")
                         .HasForeignKey("OrganizationID");
 
-                    b.HasOne("Remotely.Shared.Models.RemotelyUser", "UserID")
-                        .WithMany()
-                        .HasForeignKey("UserIDId");
-
                     b.HasOne("Remotely.Shared.Models.RemotelyUser", "User")
                         .WithMany("Alerts")
-                        .HasForeignKey("UserId");
+                        .HasForeignKey("UserID");
                 });
 
             modelBuilder.Entity("Remotely.Shared.Models.ApiToken", b =>
diff --git a/Tests/DataServiceTests.cs b/Tests/DataServiceTests.cs
index 3e24971a..19b7bec1 100644
--- a/Tests/DataServiceTests.cs
+++ b/Tests/DataServiceTests.cs
@@ -151,5 +151,19 @@ namespace Remotely.Tests
             Assert.AreEqual(1, currentAdmins.Count);
             Assert.AreEqual(TestData.Admin2.UserName, currentAdmins[0]);
         }
+
+        [TestMethod]
+        [DoNotParallelize]
+        public async Task AddAlert()
+        {
+            var alert = new Alert()
+            {
+                DeviceID = TestData.Device1.ID,
+                OrganizationID = TestData.OrganizationID,
+                Message = "Test Message",
+                UserID = TestData.Admin1.Id
+            };
+            await DataService.AddAlert(alert);
+        }
     }
 }