diff --git a/src/components/orgs/ConfirmOrgDeletion.svelte b/src/components/orgs/ConfirmOrgDeletion.svelte
deleted file mode 100644
index 9ffdcf18..00000000
--- a/src/components/orgs/ConfirmOrgDeletion.svelte
+++ /dev/null
@@ -1,108 +0,0 @@
-<script>
-  import { _ } from "svelte-i18n";
-  import { clickOutside } from "../base/outsideclick";
-
-  import { RunnerOrganizationService } from "@odit/lfk-client-js";
-
-  import { createEventDispatcher } from "svelte";
-  export let modal_open;
-  export let delete_org;
-  const dispatch = createEventDispatcher();
-  function cancelDelete() {
-    modal_open = false;
-    dispatch("cancelDelete", { id: delete_org.id });
-  }
-  function deleteOrg() {
-    RunnerOrganizationService.runnerOrganizationControllerRemove(
-      delete_org.id,
-      true
-    )
-      .then((resp) => {
-        toast($_("organization-deleted"));
-        location.replace("./");
-      })
-      .catch((err) => {});
-  }
-</script>
-
-{#if modal_open}
-  <div
-    class="fixed z-10 inset-0 overflow-y-auto"
-    use:clickOutside
-    on:click_outside={cancelDelete}
-  >
-    <div
-      class="flex items-end justify-center min-h-screen pt-4 px-4 pb-20 text-center sm:block sm:p-0"
-    >
-      <div class="fixed inset-0 transition-opacity" aria-hidden="true">
-        <div
-          class="absolute inset-0 bg-gray-500 opacity-75"
-          data-id="modal_backdrop"
-        />
-      </div>
-      <span
-        class="hidden sm:inline-block sm:align-middle sm:h-screen"
-        aria-hidden="true">&#8203;</span
-      >
-      <div
-        class="inline-block align-bottom bg-white rounded-lg text-left overflow-hidden shadow-xl transform transition-all sm:my-8 sm:align-middle sm:max-w-lg sm:w-full"
-        role="dialog"
-        aria-modal="true"
-        aria-labelledby="modal-headline"
-      >
-        <div class="bg-white px-4 pt-5 pb-4 sm:p-6 sm:pb-4">
-          <div class="sm:flex sm:items-start">
-            <div
-              class="mx-auto flex-shrink-0 flex items-center justify-center h-12 w-12 rounded-full bg-blue-100 sm:mx-0 sm:h-10 sm:w-10"
-            >
-              <svg
-                class="h-6 w-6 text-blue-600"
-                fill="currentColor"
-                width="24"
-                height="24"
-                xmlns="http://www.w3.org/2000/svg"
-                viewBox="0 0 640 512"
-                ><path
-                  fill="currentColor"
-                  d="M96 224c35.3 0 64-28.7 64-64s-28.7-64-64-64-64 28.7-64 64 28.7 64 64 64zm448 0c35.3 0 64-28.7 64-64s-28.7-64-64-64-64 28.7-64 64 28.7 64 64 64zm32 32h-64c-17.6 0-33.5 7.1-45.1 18.6 40.3 22.1 68.9 62 75.1 109.4h66c17.7 0 32-14.3 32-32v-32c0-35.3-28.7-64-64-64zm-256 0c61.9 0 112-50.1 112-112S381.9 32 320 32 208 82.1 208 144s50.1 112 112 112zm76.8 32h-8.3c-20.8 10-43.9 16-68.5 16s-47.6-6-68.5-16h-8.3C179.6 288 128 339.6 128 403.2V432c0 26.5 21.5 48 48 48h288c26.5 0 48-21.5 48-48v-28.8c0-63.6-51.6-115.2-115.2-115.2zm-223.7-13.4C161.5 263.1 145.6 256 128 256H64c-35.3 0-64 28.7-64 64v32c0 17.7 14.3 32 32 32h65.9c6.3-47.4 34.9-87.3 75.2-109.4z"
-                /></svg
-              >
-            </div>
-            <div class="mt-3 text-center sm:mt-0 sm:ml-4 sm:text-left">
-              <h3 class="text-lg leading-6 font-medium text-gray-900">
-                {$_("attention")}
-              </h3>
-              <div class="mt-2 mb-6">
-                <p class="text-sm text-gray-500">
-                  {$_(
-                    "do-you-want-to-delete-the-organization-delete_org-name",
-                    {
-                      values: { orgname: delete_org.name },
-                    }
-                  )}<br />
-                  {$_("all-associated-teams-and-runners-will-be-deleted-too")}
-                </p>
-              </div>
-            </div>
-          </div>
-        </div>
-        <div class="bg-gray-50 px-4 py-3 sm:px-6 sm:flex sm:flex-row-reverse">
-          <button
-            on:click={deleteOrg}
-            type="button"
-            class="w-full inline-flex 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:text-sm"
-          >
-            {$_("confirm-delete-organization-and-associated-teams-runners")}
-          </button>
-          <button
-            on:click={cancelDelete}
-            type="button"
-            class="mt-3 w-full inline-flex justify-center rounded-md border border-gray-300 shadow-sm px-4 py-2 bg-white text-base font-medium text-gray-700 hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 sm:mt-0 sm:ml-3 sm:w-auto sm:text-sm"
-          >
-            {$_("cancel-keep-organization")}
-          </button>
-        </div>
-      </div>
-    </div>
-  </div>
-{/if}
diff --git a/src/components/orgs/ConfirmOrgDeletionModal.svelte b/src/components/orgs/ConfirmOrgDeletionModal.svelte
new file mode 100644
index 00000000..7bbd7c4a
--- /dev/null
+++ b/src/components/orgs/ConfirmOrgDeletionModal.svelte
@@ -0,0 +1,104 @@
+<script>
+	import { _ } from "svelte-i18n";
+	import { clickOutside } from "../base/outsideclick";
+
+	import { RunnerOrganizationService } from "@odit/lfk-client-js";
+
+	import { createEventDispatcher } from "svelte";
+	export let modal_open;
+	export let delete_org;
+	const dispatch = createEventDispatcher();
+	function cancelDelete() {
+		modal_open = false;
+		dispatch("cancelDelete", { id: delete_org.id });
+	}
+	function deleteOrg() {
+		RunnerOrganizationService.runnerOrganizationControllerRemove(
+			delete_org.id,
+			true
+		)
+			.then((resp) => {
+				toast($_("organization-deleted"));
+				location.replace("./");
+			})
+			.catch((err) => {});
+	}
+</script>
+
+{#if modal_open}
+	<div
+		class="fixed z-10 inset-0 overflow-y-auto"
+		use:clickOutside
+		on:click_outside={cancelDelete}
+	>
+		<div
+			class="flex items-end justify-center min-h-screen pt-4 px-4 pb-20 text-center sm:block sm:p-0"
+		>
+			<div class="fixed inset-0 transition-opacity" aria-hidden="true">
+				<div
+					class="absolute inset-0 bg-gray-500 opacity-75"
+					data-id="modal_backdrop"
+				/>
+			</div>
+			<span
+				class="hidden sm:inline-block sm:align-middle sm:h-screen"
+				aria-hidden="true">&#8203;</span
+			>
+			<div
+				class="inline-block align-bottom bg-white rounded-lg text-left overflow-hidden shadow-xl transform transition-all sm:my-8 sm:align-middle sm:max-w-lg sm:w-full"
+				role="dialog"
+				aria-modal="true"
+				aria-labelledby="modal-headline"
+			>
+				<div class="bg-white px-4 pt-5 pb-4 sm:p-6 sm:pb-4">
+					<div class="sm:flex sm:items-start">
+						<div
+							class="mx-auto flex-shrink-0 flex items-center justify-center h-12 w-12 rounded-full bg-blue-100 sm:mx-0 sm:h-10 sm:w-10"
+						>
+							<svg
+								class="h-6 w-6 text-blue-600"
+								fill="currentColor"
+								width="24"
+								height="24"
+								xmlns="http://www.w3.org/2000/svg"
+								viewBox="0 0 640 512"
+								><path
+									fill="currentColor"
+									d="M96 224c35.3 0 64-28.7 64-64s-28.7-64-64-64-64 28.7-64 64 28.7 64 64 64zm448 0c35.3 0 64-28.7 64-64s-28.7-64-64-64-64 28.7-64 64 28.7 64 64 64zm32 32h-64c-17.6 0-33.5 7.1-45.1 18.6 40.3 22.1 68.9 62 75.1 109.4h66c17.7 0 32-14.3 32-32v-32c0-35.3-28.7-64-64-64zm-256 0c61.9 0 112-50.1 112-112S381.9 32 320 32 208 82.1 208 144s50.1 112 112 112zm76.8 32h-8.3c-20.8 10-43.9 16-68.5 16s-47.6-6-68.5-16h-8.3C179.6 288 128 339.6 128 403.2V432c0 26.5 21.5 48 48 48h288c26.5 0 48-21.5 48-48v-28.8c0-63.6-51.6-115.2-115.2-115.2zm-223.7-13.4C161.5 263.1 145.6 256 128 256H64c-35.3 0-64 28.7-64 64v32c0 17.7 14.3 32 32 32h65.9c6.3-47.4 34.9-87.3 75.2-109.4z"
+								/></svg
+							>
+						</div>
+						<div class="mt-3 text-center sm:mt-0 sm:ml-4 sm:text-left">
+							<h3 class="text-lg leading-6 font-medium text-gray-900">
+								{$_("do-you-want-to-delete-the-organization-delete_org-name", {
+									values: { orgname: delete_org.name },
+								})}
+							</h3>
+							<div class="mt-2 mb-6">
+								<p class="text-sm text-gray-500">
+									{$_("all-associated-teams-and-runners-will-be-deleted-too")}
+								</p>
+							</div>
+						</div>
+					</div>
+				</div>
+				<div class="bg-gray-50 px-4 py-3 sm:px-6 sm:flex sm:flex-row-reverse">
+					<button
+						on:click={deleteOrg}
+						type="button"
+						class="w-full inline-flex 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:text-sm"
+					>
+						{$_("confirm-delete-organization-and-associated-teams-runners")}
+					</button>
+					<button
+						on:click={cancelDelete}
+						type="button"
+						class="mt-3 w-full inline-flex justify-center rounded-md border border-gray-300 shadow-sm px-4 py-2 bg-white text-base font-medium text-gray-700 hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 sm:mt-0 sm:ml-3 sm:w-auto sm:text-sm"
+					>
+						{$_("cancel-keep-organization")}
+					</button>
+				</div>
+			</div>
+		</div>
+	</div>
+{/if}
diff --git a/src/components/orgs/OrgDetail.svelte b/src/components/orgs/OrgDetail.svelte
index 0501718d..07c87aab 100644
--- a/src/components/orgs/OrgDetail.svelte
+++ b/src/components/orgs/OrgDetail.svelte
@@ -13,8 +13,7 @@
 	import GenerateRunnerCertificates from "../pdf_generation/GenerateRunnerCertificates.svelte";
 	import GenerateSponsoringContracts from "../pdf_generation/GenerateSponsoringContracts.svelte";
 	import ImportRunnerModal from "../runners/ImportRunnerModal.svelte";
-	import ConfirmOrgDeletion from "./ConfirmOrgDeletion.svelte";
-	$: delete_triggered = false;
+	import ConfirmOrgDeletionModal from "./ConfirmOrgDeletionModal.svelte";
 	$: address_valid_or_none =
 		(isAddress1Valid && iszipcodevalid && iscityvalid) ||
 		editable.address_checked === false;
@@ -79,10 +78,7 @@
 				toast($_("organization-deleted"));
 				location.replace("./");
 			})
-			.catch((err) => {
-				modal_open = true;
-				delete_org = original_object;
-			});
+			.catch((err) => {});
 	}
 	function submit() {
 		if (data_loaded === true && save_enabled) {
@@ -142,7 +138,7 @@
 	opened_from="OrgDetail"
 	bind:import_modal_open
 />
-<ConfirmOrgDeletion bind:modal_open bind:delete_org />
+<ConfirmOrgDeletionModal bind:modal_open bind:delete_org />
 {#if data_loaded}
 	<section class="container p-5">
 		<div class="flex flex-row mb-4">
@@ -192,41 +188,24 @@
 					</button>
 				{/if}
 				{#if store.state.jwtinfo.userdetails.permissions.includes("RUNNER:DELETE")}
-					{#if delete_triggered}
-						<button
-							on:click={deleteOrganization}
-							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:w-auto sm:text-sm"
-							>{$_("confirm-delete")}</button
-						>
-						<button
-							on:click={() => {
-								delete_triggered = !delete_triggered;
-							}}
-							class="w-full justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-blue-400 text-base font-medium text-white sm:w-auto sm:text-sm"
-							>{$_("cancel")}</button
-						>
-					{/if}
-					{#if !delete_triggered}
-						<button
-							on:click={() => {
-								delete_triggered = true;
-							}}
-							type="button"
-							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:w-auto sm:text-sm"
-							>{$_("delete-organization")}</button
-						>
-					{/if}
-				{/if}
-				{#if !delete_triggered}
 					<button
-						on:click={submit}
-						disabled={!save_enabled}
-						class:opacity-50={!save_enabled}
+						on:click={() => {
+							modal_open = true;
+							delete_org = original_object;
+						}}
 						type="button"
-						class="w-full justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-blue-600 text-base font-medium text-white hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500 sm:w-auto sm:text-sm mb-1 lg:mb-0"
-						>{$_("save-changes")}</button
+						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:w-auto sm:text-sm"
+						>{$_("delete-organization")}</button
 					>
 				{/if}
+				<button
+					on:click={submit}
+					disabled={!save_enabled}
+					class:opacity-50={!save_enabled}
+					type="button"
+					class="w-full justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-blue-600 text-base font-medium text-white hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500 sm:w-auto sm:text-sm mb-1 lg:mb-0"
+					>{$_("save-changes")}</button
+				>
 			</div>
 		</div>
 		<div class="text-sm w-full mt-2">
diff --git a/src/components/orgs/Orgs.svelte b/src/components/orgs/Orgs.svelte
index 655c043d..956e2872 100644
--- a/src/components/orgs/Orgs.svelte
+++ b/src/components/orgs/Orgs.svelte
@@ -4,7 +4,7 @@
 	import { RunnerOrganizationService } from "@odit/lfk-client-js";
 	import store from "../../store";
 	import OrgsEmptyState from "./OrgsEmptyState.svelte";
-	import ConfirmOrgDeletion from "./ConfirmOrgDeletion.svelte";
+	import ConfirmOrgDeletionModal from "./ConfirmOrgDeletionModal.svelte";
 	import GenerateRunnerCards from "../pdf_generation/GenerateRunnerCards.svelte";
 	import GenerateRunnerCertificates from "../pdf_generation/GenerateRunnerCertificates.svelte";
 	import toast from "svelte-french-toast";
@@ -30,6 +30,7 @@
 		);
 	import { _ } from "svelte-i18n";
 	import AddOrgModal from "./AddOrgModal.svelte";
+	let delete_modal_open = false;
 	let modal_open = false;
 	import ImportRunnerModal from "../runners/ImportRunnerModal.svelte";
 	let import_modal_open = false;
@@ -61,12 +62,12 @@
 			{$_("import-runners")}
 		</button>
 	{/if}
-	<ConfirmOrgDeletion
+	<ConfirmOrgDeletionModal
 		on:cancelDelete={(event) => {
-			modal_open = false;
+			delete_modal_open = false;
 			active_deletes[event.detail.id] = false;
 		}}
-		bind:modal_open
+		bind:modal_open={delete_modal_open}
 		bind:delete_org
 	/>
 	{#if store.state.jwtinfo.userdetails.permissions.includes("ORGANIZATION:GET")}
@@ -196,63 +197,27 @@
 												</div>
 											</div>
 										</td>
-										{#if active_deletes[o.id] === true}
-											<td
-												class="px-6 py-4 whitespace-nowrap text-right text-sm font-medium"
+										<td
+											class="px-6 py-4 whitespace-nowrap text-right text-sm font-medium"
+										>
+											<a
+												href="./{o.id}"
+												class="text-indigo-600 hover:text-indigo-900"
+												>{$_("details")}</a
 											>
+											{#if store.state.jwtinfo.userdetails.permissions.includes("ORGANIZATION:DELETE")}
 												<button
 													on:click={() => {
-														active_deletes[o.id] = false;
-													}}
-													tabindex="0"
-													class="ml-4 text-indigo-600 hover:text-indigo-900 cursor-pointer"
-													>{$_("cancel-delete")}</button
-												>
-												<button
-													on:click={() => {
-														toast.loading($_("deleting-organization"));
-														RunnerOrganizationService.runnerOrganizationControllerRemove(
-															o.id,
-															false
-														)
-															.then((resp) => {
-																current_organizations =
-																	current_organizations.filter(
-																		(obj) => obj.id !== o.id
-																	);
-																toast($_("organization-deleted"));
-															})
-															.catch((err) => {
-																modal_open = true;
-																delete_org = o;
-															});
+														active_deletes[o.id] = true;
+														delete_modal_open = true;
+														delete_org = o;
 													}}
 													tabindex="0"
 													class="ml-4 text-red-600 hover:text-red-900 cursor-pointer"
-													>{$_("confirm-delete")}</button
+													>{$_("delete")}</button
 												>
-											</td>
-										{:else}
-											<td
-												class="px-6 py-4 whitespace-nowrap text-right text-sm font-medium"
-											>
-												<a
-													href="./{o.id}"
-													class="text-indigo-600 hover:text-indigo-900"
-													>{$_("details")}</a
-												>
-												{#if store.state.jwtinfo.userdetails.permissions.includes("ORGANIZATION:DELETE")}
-													<button
-														on:click={() => {
-															active_deletes[o.id] = true;
-														}}
-														tabindex="0"
-														class="ml-4 text-red-600 hover:text-red-900 cursor-pointer"
-														>{$_("delete")}</button
-													>
-												{/if}
-											</td>
-										{/if}
+											{/if}
+										</td>
 									</tr>
 								{/if}
 							{/each}