diff --git a/CHANGELOG b/CHANGELOG
index 7a93c59d0..89e07ed97 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -12,6 +12,7 @@ Enhancements:
 
 Fixes:
 
+* Fix ability to delete a user with a u2f key activated
 * Fix validation fails with Services
 * Fix getting birthday reminders about related contacts
 * Fix default temperature scale setting
diff --git a/app/Http/Controllers/SettingsController.php b/app/Http/Controllers/SettingsController.php
index d7102f6ce..86ba33cef 100644
--- a/app/Http/Controllers/SettingsController.php
+++ b/app/Http/Controllers/SettingsController.php
@@ -171,7 +171,7 @@ class SettingsController
 
         DB::table('accounts')->where('id', $account->id)->delete();
         auth()->logout();
-        $user->forceDelete();
+        $user->delete();
 
         return redirect()->route('login');
     }
diff --git a/database/migrations/2019_01_06_135133_update_u2f_key_table.php b/database/migrations/2019_01_06_135133_update_u2f_key_table.php
new file mode 100644
index 000000000..d68384de5
--- /dev/null
+++ b/database/migrations/2019_01_06_135133_update_u2f_key_table.php
@@ -0,0 +1,23 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class UpdateU2fKeyTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('u2f_key', function (Blueprint $table) {
+            $table->dropForeign('u2f_key_user_id_foreign');
+        });
+        Schema::table('u2f_key', function (Blueprint $table) {
+            $table->foreign('user_id')->references('id')->on('users')->onDelete('cascade');
+        });
+    }
+}