diff --git a/src/components/settings/ConfirmProfileDeletion.svelte b/src/components/settings/ConfirmProfileDeletion.svelte
index e08e0906..e9c0ea3f 100644
--- a/src/components/settings/ConfirmProfileDeletion.svelte
+++ b/src/components/settings/ConfirmProfileDeletion.svelte
@@ -6,10 +6,12 @@
   import Toastify from "toastify-js";
   import { createEventDispatcher } from "svelte";
   export let modal_open;
+  export let delete_triggered;
   const dispatch = createEventDispatcher();
   function cancelDelete() {
     modal_open = false;
-    dispatch("cancelDelete", { id: delete_donor.id });
+    delete_triggered = false;
+    dispatch("cancelDelete");
   }
   function deleteMe() {
     MeService.meControllerRemove(true)
@@ -25,6 +27,7 @@
   }
 </script>
 
+{modal_open}
 {#if modal_open}
   <div
     class="fixed z-10 inset-0 overflow-y-auto"
diff --git a/src/components/settings/Settings.svelte b/src/components/settings/Settings.svelte
index 9ec71085..d7253708 100644
--- a/src/components/settings/Settings.svelte
+++ b/src/components/settings/Settings.svelte
@@ -8,11 +8,11 @@
   $: delete_triggered = false;
   $: original_data = {};
   $: editable = {};
+  $: modal_open = false;
   $: changes_performed = !(
     JSON.stringify(editable) === JSON.stringify(original_data)
   );
   $: save_enabled = changes_performed && isEmail(editable.email);
-  let modal_open = false;
   const user_promise = MeService.meControllerGet().then((data) => {
     data_loaded = true;
     data.groups = data.groups.map((g) => g.id);
@@ -42,7 +42,7 @@
   }
 </script>
 
-<ConfirmProfileDeletion bind:modal_open />
+<ConfirmProfileDeletion bind:modal_open bind:delete_triggered/>
 <div class="pt-12 px-4 sm:px-6 lg:px-8 lg:pt-20 bg-gray-900 pb-12">
   <div class="text-center mb-8">
     <h1
@@ -51,7 +51,7 @@
     </h1>
   </div>
 </div>
-
+{modal_open}
 <div class="pt-0 pb-16 bg-gray-50 overflow-hidden lg:pt-12 lg:py-24">
   <div class="max-w-7xl mx-auto py-6 px-4 sm:px-6 lg:px-8">
     <div>
@@ -195,7 +195,9 @@
                 <span data-id="donor_actions_${editable.id}">
                     {#if delete_triggered}
                       <button
-                        on:click={modal_open=true}
+                        on:click={()=>{
+                          modal_open = true;
+                        }}
                         class="w-full justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-red-600 text-base font-medium text-white hover:bg-red-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-red-500 sm:ml-3 sm:w-auto sm:">{$_('confirm-deletion')}</button>
                       <button
                         on:click={() => {