diff --git a/bun.lock b/bun.lock
index 12377f9149..cfcf28654e 100644
--- a/bun.lock
+++ b/bun.lock
@@ -6,7 +6,7 @@
       "name": "@appwrite/console",
       "dependencies": {
         "@ai-sdk/svelte": "^1.1.24",
-        "@appwrite.io/console": "https://pkg.vc/-/@appwrite/@appwrite.io/console@8e7decc",
+        "@appwrite.io/console": "https://pkg.vc/-/@appwrite/@appwrite.io/console@86906d2",
         "@appwrite.io/pink-icons": "0.25.0",
         "@appwrite.io/pink-icons-svelte": "https://pkg.vc/-/@appwrite/@appwrite.io/pink-icons-svelte@df765cc",
         "@appwrite.io/pink-legacy": "^1.0.3",
@@ -108,7 +108,7 @@
 
     "@analytics/type-utils": ["@analytics/type-utils@0.6.4", "", {}, "sha512-Ou1gQxFakOWLcPnbFVsrPb8g1wLLUZYYJXDPjHkG07+5mustGs5yqACx42UAu4A6NszNN6Z5gGxhyH45zPWRxw=="],
 
-    "@appwrite.io/console": ["@appwrite.io/console@https://pkg.vc/-/@appwrite/@appwrite.io/console@8e7decc", { "dependencies": { "json-bigint": "1.0.0" } }],
+    "@appwrite.io/console": ["@appwrite.io/console@https://pkg.vc/-/@appwrite/@appwrite.io/console@86906d2", { "dependencies": { "json-bigint": "1.0.0" } }],
 
     "@appwrite.io/pink-icons": ["@appwrite.io/pink-icons@0.25.0", "", {}, "sha512-0O3i2oEuh5mWvjO80i+X6rbzrWLJ1m5wmv2/M3a1p2PyBJsFxN8xQMTEmTn3Wl/D26SsM7SpzbdW6gmfgoVU9Q=="],
 
diff --git a/package.json b/package.json
index 0ff0eb93c9..e7a228a5b8 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,7 @@
     },
     "dependencies": {
         "@ai-sdk/svelte": "^1.1.24",
-        "@appwrite.io/console": "https://pkg.vc/-/@appwrite/@appwrite.io/console@8e7decc",
+        "@appwrite.io/console": "https://pkg.vc/-/@appwrite/@appwrite.io/console@86906d2",
         "@appwrite.io/pink-icons": "0.25.0",
         "@appwrite.io/pink-icons-svelte": "https://pkg.vc/-/@appwrite/@appwrite.io/pink-icons-svelte@df765cc",
         "@appwrite.io/pink-legacy": "^1.0.3",
diff --git a/src/lib/actions/analytics.ts b/src/lib/actions/analytics.ts
index 023e2fbeee..396774c297 100644
--- a/src/lib/actions/analytics.ts
+++ b/src/lib/actions/analytics.ts
@@ -426,6 +426,8 @@ export enum Submit {
     MessagingTopicSubscriberDelete = 'submit_messaging_topic_subscriber_delete',
     ApplyQuickFilter = 'submit_apply_quick_filter',
     RequestBAA = 'submit_request_baa',
+    BAAAddonEnable = 'submit_baa_addon_enable',
+    BAAAddonDisable = 'submit_baa_addon_disable',
     RequestSoc2 = 'submit_request_soc2',
     SiteCreate = 'submit_site_create',
     SiteDelete = 'submit_site_delete',
diff --git a/src/lib/constants.ts b/src/lib/constants.ts
index 2cb52605e3..549c56fd61 100644
--- a/src/lib/constants.ts
+++ b/src/lib/constants.ts
@@ -85,7 +85,8 @@ export enum Dependencies {
     MESSAGING_TOPIC_SUBSCRIBERS = 'dependency:messaging_topic_subscribers',
     SITE = 'dependency:site',
     SITES = 'dependency:sites',
-    SITES_DOMAINS = 'dependency:sites_domains'
+    SITES_DOMAINS = 'dependency:sites_domains',
+    ADDONS = 'dependency:addons'
 }
 
 export const defaultScopes: string[] = [
diff --git a/src/lib/stores/migration.ts b/src/lib/stores/migration.ts
index 534cddc6a9..2dcb58df76 100644
--- a/src/lib/stores/migration.ts
+++ b/src/lib/stores/migration.ts
@@ -1,5 +1,5 @@
 import { writable } from 'svelte/store';
-import { Resources } from '@appwrite.io/console';
+import { AppwriteMigrationResource as Resources } from '@appwrite.io/console';
 import { includesAll } from '$lib/helpers/array';
 
 const initialFormData = {
diff --git a/src/routes/(console)/(migration-wizard)/resource-form.svelte b/src/routes/(console)/(migration-wizard)/resource-form.svelte
index 54e3f23ba4..39ebbd1d51 100644
--- a/src/routes/(console)/(migration-wizard)/resource-form.svelte
+++ b/src/routes/(console)/(migration-wizard)/resource-form.svelte
@@ -11,7 +11,7 @@
     } from '$lib/stores/migration';
     import { Button } from '$lib/elements/forms';
     import { wizard } from '$lib/stores/wizard';
-    import { Resources, type Models } from '@appwrite.io/console';
+    import { AppwriteMigrationResource as Resources, type Models } from '@appwrite.io/console';
     import type { sdk } from '$lib/stores/sdk';
     import ImportReport from '$routes/(console)/project-[region]-[project]/settings/migrations/(import)/importReport.svelte';
 
diff --git a/src/routes/(console)/organization-[organization]/billing/+page.ts b/src/routes/(console)/organization-[organization]/billing/+page.ts
index 4c10658caa..202a6ee25c 100644
--- a/src/routes/(console)/organization-[organization]/billing/+page.ts
+++ b/src/routes/(console)/organization-[organization]/billing/+page.ts
@@ -25,6 +25,7 @@ export const load: PageLoad = async ({ parent, depends, url, route }) => {
     depends(Dependencies.CREDIT);
     depends(Dependencies.INVOICES);
     depends(Dependencies.ADDRESS);
+    depends(Dependencies.ADDONS);
     // aggregation reloads on page param changes
     depends(Dependencies.BILLING_AGGREGATION);
 
diff --git a/src/routes/(console)/organization-[organization]/billing/planSummary.svelte b/src/routes/(console)/organization-[organization]/billing/planSummary.svelte
index afe13b5172..1acbebfdb7 100644
--- a/src/routes/(console)/organization-[organization]/billing/planSummary.svelte
+++ b/src/routes/(console)/organization-[organization]/billing/planSummary.svelte
@@ -247,8 +247,17 @@
         };
 
         // addons (additional members, projects, etc.)
+        const billingAddonNames: Record<string, string> = {
+            addon_baa: 'HIPAA BAA'
+        };
+
         const addons = (currentAggregation?.resources || [])
-            .filter((r) => r.amount > 0 && currentPlan?.addons?.[r.resourceId]?.price > 0)
+            .filter(
+                (r) =>
+                    r.amount > 0 &&
+                    (currentPlan?.addons?.[r.resourceId]?.price > 0 ||
+                        r.resourceId.startsWith('addon_'))
+            )
             .map((addon) => ({
                 id: `addon-${addon.resourceId}`,
                 expandable: false,
@@ -258,7 +267,8 @@
                             ? 'Additional members'
                             : addon.resourceId === 'projects'
                               ? 'Additional projects'
-                              : `${addon.resourceId} overage (${formatNum(addon.value)})`,
+                              : (billingAddonNames[addon.resourceId] ??
+                                `${addon.resourceId} overage (${formatNum(addon.value)})`),
                     usage: '',
                     price: formatCurrency(addon.amount)
                 },
diff --git a/src/routes/(console)/organization-[organization]/settings/+page.svelte b/src/routes/(console)/organization-[organization]/settings/+page.svelte
index b5bf05fc0d..a303b98f5e 100644
--- a/src/routes/(console)/organization-[organization]/settings/+page.svelte
+++ b/src/routes/(console)/organization-[organization]/settings/+page.svelte
@@ -6,9 +6,11 @@
     import { sdk } from '$lib/stores/sdk';
     import { members, organization } from '$lib/stores/organization';
     import { projects } from '../store';
-    import { invalidate } from '$app/navigation';
+    import { goto, invalidate } from '$app/navigation';
+    import { resolve } from '$app/paths';
     import { Dependencies } from '$lib/constants';
     import { onMount } from 'svelte';
+    import { page } from '$app/state';
     import Delete from './deleteOrganizationModal.svelte';
     import DownloadDPA from './downloadDPA.svelte';
     import { Submit, trackEvent, trackError } from '$lib/actions/analytics';
@@ -22,8 +24,66 @@
     let name: string;
     let showDelete = false;
 
-    onMount(() => {
+    onMount(async () => {
         name = $organization.name;
+
+        if (page.url.searchParams.get('type') === 'validate-addon') {
+            let addonId = page.url.searchParams.get('addonId');
+
+            // Fall back to listing addons if addonId is missing or invalid
+            if (!addonId || addonId === 'undefined') {
+                try {
+                    const addons = await sdk.forConsole.organizations.listAddons({
+                        organizationId: $organization.$id
+                    });
+                    const pending = addons.addons.find(
+                        (a) => a.key === 'baa' && a.status === 'pending'
+                    );
+                    addonId = pending?.$id ?? null;
+                } catch {
+                    addonId = null;
+                }
+            }
+
+            if (addonId) {
+                try {
+                    await sdk.forConsole.organizations.validateAddonPayment({
+                        organizationId: $organization.$id,
+                        addonId
+                    });
+                    await Promise.all([
+                        invalidate(Dependencies.ADDONS),
+                        invalidate(Dependencies.ORGANIZATION)
+                    ]);
+                    addNotification({
+                        message: 'BAA addon has been enabled',
+                        type: 'success'
+                    });
+                } catch (e) {
+                    // If addon not found, payment webhook may have already activated it
+                    if (e?.type === 'addon_not_found' || e?.code === 404) {
+                        await Promise.all([
+                            invalidate(Dependencies.ADDONS),
+                            invalidate(Dependencies.ORGANIZATION)
+                        ]);
+                        addNotification({
+                            message: 'BAA addon has been enabled',
+                            type: 'success'
+                        });
+                    } else {
+                        addNotification({
+                            message: e.message,
+                            type: 'error'
+                        });
+                    }
+                }
+            }
+
+            const settingsUrl = resolve('/(console)/organization-[organization]/settings', {
+                organization: $organization.$id
+            });
+            await goto(settingsUrl, { replaceState: true });
+        }
     });
 
     async function updateName() {
@@ -75,7 +135,7 @@
 
         {#if isCloud}
             <DownloadDPA />
-            <Baa locale={data.locale} countryList={data.countryList} />
+            <Baa addons={data.addons} />
             <Soc2 locale={data.locale} countryList={data.countryList} />
         {/if}
 
diff --git a/src/routes/(console)/organization-[organization]/settings/+page.ts b/src/routes/(console)/organization-[organization]/settings/+page.ts
index 1f377bfe33..8ec4edb17b 100644
--- a/src/routes/(console)/organization-[organization]/settings/+page.ts
+++ b/src/routes/(console)/organization-[organization]/settings/+page.ts
@@ -7,8 +7,9 @@ import { isCloud } from '$lib/system';
 export const load: PageLoad = async ({ depends, params, parent }) => {
     const { countryList, locale } = await parent();
     depends(Dependencies.ORGANIZATION);
+    depends(Dependencies.ADDONS);
 
-    const [projects, invoices] = await Promise.all([
+    const [projects, invoices, addons] = await Promise.all([
         sdk.forConsole.projects.list({
             queries: [Query.equal('teamId', params.organization), Query.select(['$id', 'name'])]
         }),
@@ -16,12 +17,20 @@ export const load: PageLoad = async ({ depends, params, parent }) => {
             ? sdk.forConsole.organizations.listInvoices({
                   organizationId: params.organization
               })
-            : undefined
+            : undefined,
+        isCloud
+            ? sdk.forConsole.organizations
+                  .listAddons({
+                      organizationId: params.organization
+                  })
+                  .catch(() => null)
+            : null
     ]);
 
     return {
         projects,
         invoices,
+        addons,
         countryList,
         locale
     };
diff --git a/src/routes/(console)/organization-[organization]/settings/BAA.svelte b/src/routes/(console)/organization-[organization]/settings/BAA.svelte
index 87b33da1f1..5a458da47a 100644
--- a/src/routes/(console)/organization-[organization]/settings/BAA.svelte
+++ b/src/routes/(console)/organization-[organization]/settings/BAA.svelte
@@ -1,38 +1,181 @@
 <script lang="ts">
     import { Box, CardGrid } from '$lib/components';
     import { Button } from '$lib/elements/forms';
-    import BaaModal from './BAAModal.svelte';
+    import { getChangePlanUrl, plansInfo } from '$lib/stores/billing';
+    import { currentPlan } from '$lib/stores/organization';
+    import { organization } from '$lib/stores/organization';
+    import { get } from 'svelte/store';
+    import { invalidate } from '$app/navigation';
+    import { Dependencies } from '$lib/constants';
+    import { addNotification } from '$lib/stores/notifications';
+    import { sdk } from '$lib/stores/sdk';
+    import { Submit, trackEvent, trackError } from '$lib/actions/analytics';
+    import { Badge } from '@appwrite.io/pink-svelte';
     import type { Models } from '@appwrite.io/console';
+    import BAAEnableModal from './BAAEnableModal.svelte';
+    import BAADisableModal from './BAADisableModal.svelte';
 
-    let show = false;
+    export let addons: Models.AddonList | null = null;
 
-    export let locale: Models.Locale;
-    export let countryList: Models.CountryList;
+    let showEnable = false;
+    let showDisable = false;
+    let reEnabling = false;
+    let cancelling = false;
+
+    $: planSupportsBaa = $currentPlan?.supportedAddons?.baa === true;
+    $: canUpgradeToBaa = !planSupportsBaa && hasUpgradeablePlanWithBaa($currentPlan);
+    $: baaAddon = addons?.addons?.find(
+        (a) => a.key === 'baa' && (a.status === 'active' || a.status === 'pending')
+    );
+    $: isPending = baaAddon?.status === 'pending';
+    $: isActive = baaAddon?.status === 'active';
+    $: isScheduledForRemoval = isActive && baaAddon?.nextValue === 0;
+
+    function hasUpgradeablePlanWithBaa(plan: Models.BillingPlan): boolean {
+        if (!plan) return false;
+        const plans = get(plansInfo);
+        for (const [, p] of plans) {
+            if (p.order > plan.order && p.supportedAddons?.baa) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    async function handleCancelAndRetry() {
+        cancelling = true;
+        try {
+            await sdk.forConsole.organizations.deleteAddon({
+                organizationId: $organization.$id,
+                addonId: baaAddon.$id
+            });
+            await invalidate(Dependencies.ADDONS);
+            showEnable = true;
+        } catch (e) {
+            addNotification({
+                message: e.message,
+                type: 'error'
+            });
+        } finally {
+            cancelling = false;
+        }
+    }
+
+    async function handleReEnable() {
+        reEnabling = true;
+        try {
+            await sdk.forConsole.organizations.createBaaAddon({
+                organizationId: $organization.$id,
+                key: 'baa'
+            });
+            await Promise.all([
+                invalidate(Dependencies.ADDONS),
+                invalidate(Dependencies.ORGANIZATION)
+            ]);
+            addNotification({
+                message: 'BAA addon has been re-enabled',
+                type: 'success'
+            });
+            trackEvent(Submit.BAAAddonEnable);
+        } catch (e) {
+            addNotification({
+                message: e.message,
+                type: 'error'
+            });
+            trackError(e, Submit.BAAAddonEnable);
+        } finally {
+            reEnabling = false;
+        }
+    }
 </script>
 
 <CardGrid>
     <svelte:fragment slot="title">BAA</svelte:fragment>
-    After requesting a BAA, we will contact you via email for the next steps.
+    A Business Associate Agreement (BAA) is a HIPAA-required document ensuring outside services handling
+    patient information for a healthcare organization follow privacy rules.
     <svelte:fragment slot="aside">
         <Box>
             <h6>
                 <b>Business Associate Agreement (BAA)</b>
             </h6>
-            <p class="text u-margin-block-start-8">
-                A Business Associate Agreement (BAA) is a HIPAA-required document ensuring outside
-                services handling patient information for a healthcare organization follow privacy
-                rules.
-            </p>
-            <Button
-                secondary
-                external
-                class="u-margin-block-start-16"
-                on:click={() => (show = true)}
-                event="request_baa">
-                <span class="text">Request BAA</span>
-            </Button>
+            {#if !planSupportsBaa && canUpgradeToBaa}
+                <p class="text u-margin-block-start-8">
+                    BAA is not available on your current plan. Upgrade your plan to enable BAA for
+                    your organization.
+                </p>
+                <Button
+                    secondary
+                    class="u-margin-block-start-16"
+                    href={getChangePlanUrl($organization?.$id)}>
+                    <span class="text">Upgrade plan</span>
+                </Button>
+            {:else if !planSupportsBaa}
+                <p class="text u-margin-block-start-8">
+                    BAA is not available on your current plan.
+                </p>
+            {:else if isPending}
+                <div class="u-flex u-cross-center u-gap-8 u-margin-block-start-8">
+                    <Badge variant="secondary" type="warning" content="Payment pending" />
+                </div>
+                <p class="text u-margin-block-start-8">
+                    A payment is awaiting confirmation. If the payment was interrupted, you can
+                    cancel and retry.
+                </p>
+                <Button
+                    secondary
+                    class="u-margin-block-start-16"
+                    disabled={cancelling}
+                    on:click={handleCancelAndRetry}>
+                    <span class="text">Cancel & retry</span>
+                </Button>
+            {:else if isActive}
+                <div class="u-flex u-cross-center u-gap-8 u-margin-block-start-8">
+                    {#if isScheduledForRemoval}
+                        <Badge variant="secondary" type="warning" content="Scheduled for removal" />
+                    {:else}
+                        <Badge variant="secondary" type="success" content="Active" />
+                    {/if}
+                </div>
+                <p class="text u-margin-block-start-8">
+                    BAA is enabled for your organization at $350/month.
+                </p>
+                {#if isScheduledForRemoval}
+                    <p class="text u-margin-block-start-8">
+                        BAA will be removed at the end of your current billing cycle.
+                    </p>
+                    <Button
+                        secondary
+                        class="u-margin-block-start-16"
+                        disabled={reEnabling}
+                        on:click={handleReEnable}>
+                        <span class="text">Keep BAA</span>
+                    </Button>
+                {:else}
+                    <Button
+                        secondary
+                        class="u-margin-block-start-16"
+                        on:click={() => (showDisable = true)}>
+                        <span class="text">Disable BAA</span>
+                    </Button>
+                {/if}
+            {:else}
+                <p class="text u-margin-block-start-8">
+                    Enable BAA for your organization to ensure HIPAA compliance. This addon costs
+                    $350/month, prorated for your current billing cycle.
+                </p>
+                <Button
+                    secondary
+                    class="u-margin-block-start-16"
+                    on:click={() => (showEnable = true)}>
+                    <span class="text">Enable BAA</span>
+                </Button>
+            {/if}
         </Box>
     </svelte:fragment>
 </CardGrid>
 
-<BaaModal {locale} {countryList} bind:show />
+<BAAEnableModal bind:show={showEnable} />
+
+{#if baaAddon}
+    <BAADisableModal bind:show={showDisable} addonId={baaAddon.$id} />
+{/if}
diff --git a/src/routes/(console)/organization-[organization]/settings/BAADisableModal.svelte b/src/routes/(console)/organization-[organization]/settings/BAADisableModal.svelte
new file mode 100644
index 0000000000..a1a5817bce
--- /dev/null
+++ b/src/routes/(console)/organization-[organization]/settings/BAADisableModal.svelte
@@ -0,0 +1,54 @@
+<script lang="ts">
+    import { invalidate } from '$app/navigation';
+    import { Modal } from '$lib/components';
+    import { Button } from '$lib/elements/forms';
+    import { Dependencies } from '$lib/constants';
+    import { addNotification } from '$lib/stores/notifications';
+    import { Submit, trackEvent, trackError } from '$lib/actions/analytics';
+    import { organization } from '$lib/stores/organization';
+    import { sdk } from '$lib/stores/sdk';
+
+    export let show = false;
+    export let addonId: string;
+
+    let error: string = null;
+    let submitting = false;
+
+    async function handleSubmit() {
+        submitting = true;
+        error = null;
+        try {
+            await sdk.forConsole.organizations.deleteAddon({
+                organizationId: $organization.$id,
+                addonId
+            });
+            await Promise.all([
+                invalidate(Dependencies.ADDONS),
+                invalidate(Dependencies.ORGANIZATION)
+            ]);
+            addNotification({
+                message: 'BAA addon will be removed at the end of your current billing cycle',
+                type: 'success'
+            });
+            trackEvent(Submit.BAAAddonDisable);
+            show = false;
+        } catch (e) {
+            error = e.message;
+            trackError(e, Submit.BAAAddonDisable);
+        } finally {
+            submitting = false;
+        }
+    }
+</script>
+
+<Modal bind:error bind:show onSubmit={handleSubmit} title="Disable BAA">
+    <p class="text">
+        Are you sure you want to disable the BAA addon? The addon will remain active until the end
+        of your current billing cycle and will not be renewed.
+    </p>
+
+    <svelte:fragment slot="footer">
+        <Button text on:click={() => (show = false)}>Cancel</Button>
+        <Button secondary submit disabled={submitting}>Disable BAA</Button>
+    </svelte:fragment>
+</Modal>
diff --git a/src/routes/(console)/organization-[organization]/settings/BAAEnableModal.svelte b/src/routes/(console)/organization-[organization]/settings/BAAEnableModal.svelte
new file mode 100644
index 0000000000..6aa4fe7fee
--- /dev/null
+++ b/src/routes/(console)/organization-[organization]/settings/BAAEnableModal.svelte
@@ -0,0 +1,159 @@
+<script lang="ts">
+    import { invalidate } from '$app/navigation';
+    import { resolve } from '$app/paths';
+    import { Modal } from '$lib/components';
+    import { Button } from '$lib/elements/forms';
+    import { Dependencies } from '$lib/constants';
+    import { addNotification } from '$lib/stores/notifications';
+    import { Submit, trackEvent, trackError } from '$lib/actions/analytics';
+    import { confirmPayment } from '$lib/stores/stripe';
+    import { organization } from '$lib/stores/organization';
+    import { sdk } from '$lib/stores/sdk';
+    import { formatCurrency } from '$lib/helpers/numbers';
+    import type { Models } from '@appwrite.io/console';
+
+    export let show = false;
+
+    const BAA_MONTHLY_PRICE = 350;
+    const BAA_AGREEMENT_URL = 'https://appwrite.io/legal/baa';
+
+    let error: string | null = null;
+    let submitting = false;
+
+    $: proratedAmount = calculateProratedAmount(
+        $organization?.billingCurrentInvoiceDate,
+        $organization?.billingNextInvoiceDate
+    );
+
+    function calculateProratedAmount(
+        currentInvoiceDate: string | undefined,
+        nextInvoiceDate: string | undefined
+    ): number {
+        if (!currentInvoiceDate || !nextInvoiceDate) return BAA_MONTHLY_PRICE;
+
+        const today = new Date();
+        const cycleStart = new Date(currentInvoiceDate);
+        const cycleEnd = new Date(nextInvoiceDate);
+
+        const totalDays = Math.max(
+            1,
+            Math.ceil((cycleEnd.getTime() - cycleStart.getTime()) / (1000 * 60 * 60 * 24))
+        );
+        const remainingDays = Math.max(
+            0,
+            Math.ceil((cycleEnd.getTime() - today.getTime()) / (1000 * 60 * 60 * 24))
+        );
+
+        return Math.round(((BAA_MONTHLY_PRICE * remainingDays) / totalDays) * 100) / 100;
+    }
+
+    async function handleSubmit() {
+        submitting = true;
+        error = null;
+        try {
+            const result: Models.Addon | Models.PaymentAuthentication =
+                await sdk.forConsole.organizations.createBaaAddon({
+                    organizationId: $organization.$id,
+                    key: 'baa'
+                });
+
+            if ('clientSecret' in result) {
+                const paymentAuth = result as unknown as Models.PaymentAuthentication;
+                const settingsUrl = resolve('/(console)/organization-[organization]/settings', {
+                    organization: $organization.$id
+                });
+                await confirmPayment({
+                    clientSecret: paymentAuth.clientSecret,
+                    paymentMethodId: $organization.paymentMethodId,
+                    orgId: $organization.$id,
+                    route: `${settingsUrl}?type=validate-addon&addonId=${paymentAuth.addonId}`
+                });
+                return;
+            }
+
+            await Promise.all([
+                invalidate(Dependencies.ADDONS),
+                invalidate(Dependencies.ORGANIZATION)
+            ]);
+            addNotification({
+                message: 'BAA addon has been enabled',
+                type: 'success'
+            });
+            trackEvent(Submit.BAAAddonEnable);
+            show = false;
+        } catch (e) {
+            // 409 means addon already exists (pending or active from prior attempt)
+            if (e?.code === 409) {
+                await Promise.all([
+                    invalidate(Dependencies.ADDONS),
+                    invalidate(Dependencies.ORGANIZATION)
+                ]);
+                show = false;
+            } else {
+                error = e.message;
+                trackError(e, Submit.BAAAddonEnable);
+            }
+        } finally {
+            submitting = false;
+        }
+    }
+</script>
+
+<Modal bind:error bind:show onSubmit={handleSubmit} title="HIPAA BAA">
+    <p class="text">
+        By clicking <b>Accept & Enable</b>, the amount of
+        <b>{formatCurrency(BAA_MONTHLY_PRICE)}</b> will be added to your subscription and your
+        payment method will be charged
+        <b>{formatCurrency(proratedAmount)} immediately</b> for the remaining days in your billing cycle.
+    </p>
+    <p class="text u-margin-block-start-16">
+        Your action confirms acceptance of Appwrite's
+        <a class="link" href={BAA_AGREEMENT_URL} target="_blank" rel="noopener noreferrer"
+            >Business Associate Agreement</a>
+        and related terms.
+    </p>
+
+    <div class="price-breakdown u-margin-block-start-24">
+        <div class="price-row">
+            <span class="text">HIPAA BAA</span>
+            <span class="text">{formatCurrency(BAA_MONTHLY_PRICE)} / month</span>
+        </div>
+        <hr class="divider" />
+        <div class="price-row u-bold">
+            <span class="text">Total</span>
+            <span class="text">{formatCurrency(BAA_MONTHLY_PRICE)} / month</span>
+        </div>
+        <p class="text u-color-text-offline u-margin-block-start-8 u-text-end">
+            * Plus applicable tax and fees
+        </p>
+    </div>
+
+    <svelte:fragment slot="footer">
+        <Button text on:click={() => (show = false)}>Cancel</Button>
+        <Button secondary submit disabled={submitting}>Accept & Enable</Button>
+    </svelte:fragment>
+</Modal>
+
+<style>
+    .price-breakdown {
+        border: 1px solid hsl(var(--color-border));
+        border-radius: var(--border-radius-small);
+        padding: 1rem;
+    }
+
+    .price-row {
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+    }
+
+    .divider {
+        border: none;
+        border-top: 1px solid hsl(var(--color-border));
+        margin-block: 0.75rem;
+    }
+
+    .u-text-end {
+        text-align: end;
+    }
+</style>
diff --git a/src/routes/(console)/organization-[organization]/settings/BAAModal.svelte b/src/routes/(console)/organization-[organization]/settings/BAAModal.svelte
deleted file mode 100644
index 1aaccfef2a..0000000000
--- a/src/routes/(console)/organization-[organization]/settings/BAAModal.svelte
+++ /dev/null
@@ -1,125 +0,0 @@
-<script lang="ts">
-    import { Submit, trackError, trackEvent } from '$lib/actions/analytics';
-    import { Modal } from '$lib/components';
-    import { Button, InputEmail, InputSelect, InputText } from '$lib/elements/forms';
-    import { addNotification } from '$lib/stores/notifications';
-    import { organization } from '$lib/stores/organization';
-    import { user } from '$lib/stores/user';
-    import { VARS } from '$lib/system';
-    import { onMount } from 'svelte';
-    import type { Models } from '@appwrite.io/console';
-
-    export let show = false;
-    export let locale: Models.Locale;
-    export let countryList: Models.CountryList;
-
-    let email = '';
-    let employees: string = null;
-    let employeesOptions = [
-        {
-            value: '1-5',
-            label: '1-5'
-        },
-        {
-            value: '6-10',
-            label: '6-10'
-        },
-        {
-            value: '11-50',
-            label: '11-50'
-        },
-        {
-            value: '50+',
-            label: '50+'
-        }
-    ];
-
-    let country = '';
-    let countryOptions = [];
-
-    let role = '';
-    let website = '';
-
-    let error: string;
-
-    onMount(async () => {
-        if (locale.countryCode) {
-            country = locale.countryCode;
-        }
-        countryOptions = countryList.countries.map((country) => {
-            return {
-                value: country.code,
-                label: country.name
-            };
-        });
-        email = $user.email;
-    });
-
-    async function handleSubmit() {
-        const response = await fetch(`${VARS.GROWTH_ENDPOINT}/support`, {
-            method: 'POST',
-            headers: {
-                'Content-Type': 'application/json'
-            },
-            body: JSON.stringify({
-                subject: 'BAA Request',
-                email: email,
-                firstName: ($user?.name ?? '').slice(0, 40),
-                message: `BAA request for ${$organization?.name ?? ''} (${$organization?.$id ?? ''})`,
-                tags: ['cloud'],
-                metaFields: {
-                    category: 'BAA',
-                    userName: $user?.name ?? '',
-                    orgId: $organization?.$id ?? '',
-                    userId: $user?.$id ?? '',
-                    employees: employees,
-                    country: country,
-                    role: role,
-                    website: website
-                }
-            })
-        });
-        trackEvent(Submit.RequestBAA);
-        if (response.status !== 200) {
-            trackError(new Error(response.status.toString()), Submit.RequestBAA);
-            error = 'There was an error submitting your request. Please try again later.';
-        } else {
-            show = false;
-            addNotification({
-                message: `Your request was sent, we will get in contact with you at ${email} in a few working days`,
-                type: 'success'
-            });
-        }
-    }
-</script>
-
-<Modal bind:error bind:show onSubmit={handleSubmit} title="Request BAA">
-    <InputEmail label="Email" placeholder="Enter email" id="email" bind:value={email} />
-    <InputSelect
-        label="Number of employees"
-        id="employees"
-        placeholder="Select number of employees"
-        required
-        options={employeesOptions}
-        bind:value={employees} />
-    <InputSelect
-        label="Country"
-        id="country"
-        options={countryOptions}
-        placeholder="Select country"
-        required
-        bind:value={country} />
-    <InputText
-        label="Your role"
-        placeholder="Enter your role"
-        id="role"
-        bind:value={role}
-        required />
-    <InputText label="Website" placeholder="Enter website" id="website" bind:value={website} />
-
-    <svelte:fragment slot="footer">
-        <Button submit>
-            <span class="text">Send request</span>
-        </Button>
-    </svelte:fragment>
-</Modal>