diff --git a/BTCPayServer.Data/Data/ApplicationDbContext.cs b/BTCPayServer.Data/Data/ApplicationDbContext.cs
index 1de87caa7..0e18da7de 100644
--- a/BTCPayServer.Data/Data/ApplicationDbContext.cs
+++ b/BTCPayServer.Data/Data/ApplicationDbContext.cs
@@ -90,7 +90,8 @@ namespace BTCPayServer.Data
             PullPaymentData.OnModelCreating(builder);
             PayoutData.OnModelCreating(builder);
             RefundData.OnModelCreating(builder);
-
+            U2FDevice.OnModelCreating(builder);
+            
             if (Database.IsSqlite() && !_designTime)
             {
                 // SQLite does not have proper support for DateTimeOffset via Entity Framework Core, see the limitations
diff --git a/BTCPayServer.Data/Data/U2FDevice.cs b/BTCPayServer.Data/Data/U2FDevice.cs
index abf752310..57252f0e6 100644
--- a/BTCPayServer.Data/Data/U2FDevice.cs
+++ b/BTCPayServer.Data/Data/U2FDevice.cs
@@ -1,4 +1,5 @@
 using System.ComponentModel.DataAnnotations;
+using Microsoft.EntityFrameworkCore;
 
 namespace BTCPayServer.Data
 {
@@ -18,5 +19,15 @@ namespace BTCPayServer.Data
 
         public string ApplicationUserId { get; set; }
         public ApplicationUser ApplicationUser { get; set; }
+        
+        
+        internal static void OnModelCreating(ModelBuilder builder)
+        {
+            builder.Entity<U2FDevice>()
+                .HasOne(o => o.ApplicationUser)
+                .WithMany(i => i.U2FDevices)
+                .HasForeignKey(i => i.ApplicationUserId).OnDelete(DeleteBehavior.Cascade);
+            
+        }
     }
 }
diff --git a/BTCPayServer.Data/Migrations/20201007090617_u2fDeviceCascade.cs b/BTCPayServer.Data/Migrations/20201007090617_u2fDeviceCascade.cs
new file mode 100644
index 000000000..2b97a86d0
--- /dev/null
+++ b/BTCPayServer.Data/Migrations/20201007090617_u2fDeviceCascade.cs
@@ -0,0 +1,47 @@
+using BTCPayServer.Data;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace BTCPayServer.Migrations
+{
+    [DbContext(typeof(ApplicationDbContext))]
+    [Migration("20201007090617_u2fDeviceCascade")]
+    public partial class u2fDeviceCascade : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            if (this.SupportDropForeignKey(migrationBuilder.ActiveProvider))
+            {
+                migrationBuilder.DropForeignKey(
+                    name: "FK_U2FDevices_AspNetUsers_ApplicationUserId",
+                    table: "U2FDevices");
+
+                migrationBuilder.AddForeignKey(
+                    name: "FK_U2FDevices_AspNetUsers_ApplicationUserId",
+                    table: "U2FDevices",
+                    column: "ApplicationUserId",
+                    principalTable: "AspNetUsers",
+                    principalColumn: "Id",
+                    onDelete: ReferentialAction.Cascade);
+            }
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            if (this.SupportDropForeignKey(migrationBuilder.ActiveProvider))
+            {
+                migrationBuilder.DropForeignKey(
+                    name: "FK_U2FDevices_AspNetUsers_ApplicationUserId",
+                    table: "U2FDevices");
+
+                migrationBuilder.AddForeignKey(
+                    name: "FK_U2FDevices_AspNetUsers_ApplicationUserId",
+                    table: "U2FDevices",
+                    column: "ApplicationUserId",
+                    principalTable: "AspNetUsers",
+                    principalColumn: "Id",
+                    onDelete: ReferentialAction.Restrict);
+            }
+        }
+    }
+}
diff --git a/BTCPayServer.Data/Migrations/ApplicationDbContextModelSnapshot.cs b/BTCPayServer.Data/Migrations/ApplicationDbContextModelSnapshot.cs
index 4e0ae306e..cbc070198 100644
--- a/BTCPayServer.Data/Migrations/ApplicationDbContextModelSnapshot.cs
+++ b/BTCPayServer.Data/Migrations/ApplicationDbContextModelSnapshot.cs
@@ -525,7 +525,8 @@ namespace BTCPayServer.Migrations
                         .HasColumnType("TEXT");
 
                     b.Property<string>("PullPaymentDataId")
-                        .HasColumnType("TEXT");
+                        .HasColumnType("TEXT")
+                        .HasMaxLength(30);
 
                     b.HasKey("InvoiceDataId", "PullPaymentDataId");
 
@@ -960,7 +961,8 @@ namespace BTCPayServer.Migrations
                 {
                     b.HasOne("BTCPayServer.Data.ApplicationUser", "ApplicationUser")
                         .WithMany("U2FDevices")
-                        .HasForeignKey("ApplicationUserId");
+                        .HasForeignKey("ApplicationUserId")
+                        .OnDelete(DeleteBehavior.Cascade);
                 });
 
             modelBuilder.Entity("BTCPayServer.Data.UserStore", b =>