diff --git a/src/routes/console/organization-[organization]/settings/+page.svelte b/src/routes/console/organization-[organization]/settings/+page.svelte
index c32cec95e..0b90d5da2 100644
--- a/src/routes/console/organization-[organization]/settings/+page.svelte
+++ b/src/routes/console/organization-[organization]/settings/+page.svelte
@@ -84,7 +84,10 @@
             </svelte:fragment>
 
             <svelte:fragment slot="actions">
-                <Button secondary on:click={() => (showDelete = true)}>Delete</Button>
+                <Button
+                    disabled={$organization?.markedForDeletion}
+                    secondary
+                    on:click={() => (showDelete = true)}>Delete</Button>
             </svelte:fragment>
         </CardGrid>
     {/if}
diff --git a/src/routes/console/organization-[organization]/settings/deleteOrganization.svelte b/src/routes/console/organization-[organization]/settings/deleteOrganization.svelte
index 03a4e907c..06c84b29d 100644
--- a/src/routes/console/organization-[organization]/settings/deleteOrganization.svelte
+++ b/src/routes/console/organization-[organization]/settings/deleteOrganization.svelte
@@ -26,7 +26,7 @@
             }
             addNotification({
                 type: 'success',
-                message: `${$organization.name} has been deleted`
+                message: `${$organization.name} has been flagged for deletion`
             });
             await invalidate(Dependencies.ACCOUNT);
             await invalidate(Dependencies.ORGANIZATION);
diff --git a/src/routes/console/wizard/cloudOrganization/confirmDetails.svelte b/src/routes/console/wizard/cloudOrganization/confirmDetails.svelte
index 6adc3ad0b..991d06f5e 100644
--- a/src/routes/console/wizard/cloudOrganization/confirmDetails.svelte
+++ b/src/routes/console/wizard/cloudOrganization/confirmDetails.svelte
@@ -26,12 +26,21 @@
         }
     }
 
+    async function handleBefore() {
+        if (!$createOrganization.billingPlan) {
+            throw new Error('Please select a plan.');
+        }
+        if ($createOrganization.billingPlan === 'tier-0') {
+            $createOrganization.collaborators = [];
+        }
+    }
+
     $: if ($createOrganization.billingPlan === 'tier-0') {
         $createOrganizationFinalAction = 'Create organization';
     }
 </script>
 
-<WizardStep>
+<WizardStep beforeSubmit={handleBefore}>
     <svelte:fragment slot="title">Confirm your details</svelte:fragment>
     <svelte:fragment slot="subtitle">
         Confirm the details of your new organization and start your free trial.
diff --git a/src/routes/console/wizard/cloudOrganization/inviteMembers.svelte b/src/routes/console/wizard/cloudOrganization/inviteMembers.svelte
index b034b61f2..7748c33ce 100644
--- a/src/routes/console/wizard/cloudOrganization/inviteMembers.svelte
+++ b/src/routes/console/wizard/cloudOrganization/inviteMembers.svelte
@@ -18,6 +18,7 @@
 
     function addCollaborator() {
         if (!email) return;
+        if ($createOrganization.collaborators.includes(email)) return;
         $createOrganization.collaborators.push(email);
         $createOrganization = $createOrganization;
         email = '';
diff --git a/src/routes/console/wizard/cloudOrganizationChangeTier/choosePlan.svelte b/src/routes/console/wizard/cloudOrganizationChangeTier/choosePlan.svelte
index 464145999..ea4035761 100644
--- a/src/routes/console/wizard/cloudOrganizationChangeTier/choosePlan.svelte
+++ b/src/routes/console/wizard/cloudOrganizationChangeTier/choosePlan.svelte
@@ -87,12 +87,21 @@
         }
     });
 
+    async function handleBefore() {
+        if (!$changeOrganizationTier.billingPlan) {
+            throw new Error('Please select a plan.');
+        }
+        if ($changeOrganizationTier.billingPlan === 'tier-0') {
+            $changeOrganizationTier.collaborators = [];
+        }
+    }
+
     $: freePlan = $plansInfo.plans.find((p) => p.$id === 'tier-0');
     $: proPlan = $plansInfo.plans.find((p) => p.$id === 'tier-1');
     $: scalePlan = $plansInfo.plans.find((p) => p.$id === 'tier-2');
 </script>
 
-<WizardStep>
+<WizardStep beforeSubmit={handleBefore}>
     <svelte:fragment slot="title">Choose a plan</svelte:fragment>
 
     <p class="body-text-1 u-bold common-section">Plan</p>
diff --git a/src/routes/console/wizard/cloudOrganizationChangeTier/inviteMembers.svelte b/src/routes/console/wizard/cloudOrganizationChangeTier/inviteMembers.svelte
index fcf674419..61a5f1154 100644
--- a/src/routes/console/wizard/cloudOrganizationChangeTier/inviteMembers.svelte
+++ b/src/routes/console/wizard/cloudOrganizationChangeTier/inviteMembers.svelte
@@ -20,6 +20,8 @@
 
     function addCollaborator() {
         if (!email) return;
+        if ($changeOrganizationTier.collaborators.includes(email)) return;
+
         $changeOrganizationTier.collaborators.push(email);
         $changeOrganizationTier = $changeOrganizationTier;
         email = '';