diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/organizations/api.svelte.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/organizations/api.svelte.ts
index ecc230173..b9359d691 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/organizations/api.svelte.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/organizations/api.svelte.ts
@@ -1,5 +1,5 @@
 import type { WebSocketMessageValue } from '$features/websockets/models';
-import type { BillingPlan, ChangePlanRequest, ChangePlanResult } from '$lib/generated/api';
+import type { BillingPlan, ChangePlanRequest, ChangePlanResult, StringValueFromBody } from '$lib/generated/api';
 import type { QueryClient } from '@tanstack/svelte-query';
 
 import { accessToken } from '$features/auth/index.svelte';
@@ -26,6 +26,7 @@ export async function invalidateOrganizationQueries(queryClient: QueryClient, me
 export const queryKeys = {
     adminSearch: (params: GetAdminSearchOrganizationsParams) => [...queryKeys.list(params.mode), 'admin', { ...params }] as const,
     changePlan: (id: string | undefined) => [...queryKeys.type, id, 'change-plan'] as const,
+    data: (id: string | undefined) => [...queryKeys.type, id, 'data'] as const,
     deleteOrganization: (ids: string[] | undefined) => [...queryKeys.ids(ids), 'delete'] as const,
     icon: (id: string | undefined) => [...queryKeys.id(id, undefined), 'icon'] as const,
     id: (id: string | undefined, mode: 'stats' | undefined) => (mode ? ([...queryKeys.type, id, { mode }] as const) : ([...queryKeys.type, id] as const)),
@@ -54,6 +55,16 @@ export interface ChangePlanMutationRequest {
     };
 }
 
+export interface DeleteOrganizationDataParams {
+    key: string;
+}
+
+export interface DeleteOrganizationDataRequest {
+    route: {
+        id: string | undefined;
+    };
+}
+
 export interface DeleteOrganizationRequest {
     route: {
         ids: string[];
@@ -142,6 +153,17 @@ export interface PatchOrganizationRequest {
     };
 }
 
+export interface PostOrganizationDataParams {
+    key: string;
+    value: string;
+}
+
+export interface PostOrganizationDataRequest {
+    route: {
+        id: string | undefined;
+    };
+}
+
 export interface PostSetBonusOrganizationParams {
     bonusEvents: number;
     expires?: Date;
@@ -225,6 +247,35 @@ export function deleteOrganization(request: DeleteOrganizationRequest) {
     }));
 }
 
+export function deleteOrganizationData(request: DeleteOrganizationDataRequest) {
+    const queryClient = useQueryClient();
+
+    return createMutation<boolean, ProblemDetails, DeleteOrganizationDataParams>(() => ({
+        enabled: () => !!accessToken.current && !!request.route.id,
+        mutationFn: async ({ key }: DeleteOrganizationDataParams) => {
+            const client = useFetchClient();
+            const response = await client.delete(`organizations/${request.route.id}/data/${encodeURIComponent(key)}`);
+            return response.ok;
+        },
+        mutationKey: queryKeys.data(request.route.id),
+        onError: () => {
+            queryClient.invalidateQueries({ queryKey: queryKeys.id(request.route.id, undefined) });
+        },
+        onSuccess: (_, { key }) => {
+            updateOrganizationQueryData(queryClient, request.route.id, (organization) => {
+                if (!organization.data) {
+                    return organization;
+                }
+
+                const data = { ...organization.data };
+                delete data[key];
+
+                return { ...organization, data };
+            });
+        }
+    }));
+}
+
 export function deleteOrganizationIcon(request: OrganizationIconRequest) {
     const queryClient = useQueryClient();
 
@@ -462,6 +513,32 @@ export function postOrganization() {
     }));
 }
 
+export function postOrganizationData(request: PostOrganizationDataRequest) {
+    const queryClient = useQueryClient();
+
+    return createMutation<boolean, ProblemDetails, PostOrganizationDataParams>(() => ({
+        enabled: () => !!accessToken.current && !!request.route.id,
+        mutationFn: async ({ key, value }: PostOrganizationDataParams) => {
+            const client = useFetchClient();
+            const response = await client.post(`organizations/${request.route.id}/data/${encodeURIComponent(key)}`, <StringValueFromBody>{ value });
+            return response.ok;
+        },
+        mutationKey: queryKeys.data(request.route.id),
+        onError: () => {
+            queryClient.invalidateQueries({ queryKey: queryKeys.id(request.route.id, undefined) });
+        },
+        onSuccess: (_, { key, value }) => {
+            updateOrganizationQueryData(queryClient, request.route.id, (organization) => ({
+                ...organization,
+                data: {
+                    ...(organization.data ?? {}),
+                    [key]: value
+                }
+            }));
+        }
+    }));
+}
+
 export function postSetBonusOrganization() {
     const queryClient = useQueryClient();
 
@@ -594,3 +671,22 @@ function updateOrganizationCache(queryClient: QueryClient, id: string | undefine
         };
     });
 }
+
+function updateOrganizationQueryData(queryClient: QueryClient, id: string | undefined, updater: (organization: ViewOrganization) => ViewOrganization) {
+    for (const mode of [undefined, 'stats'] as const) {
+        queryClient.setQueryData<undefined | ViewOrganization>(queryKeys.id(id, mode), (organization) => (organization ? updater(organization) : organization));
+    }
+
+    queryClient.setQueriesData<FetchClientResponse<ViewOrganization[]> | undefined>({ queryKey: queryKeys.type }, (response) => {
+        if (!Array.isArray(response?.data) || !response.data.some((organization) => organization.id === id)) {
+            return response;
+        }
+
+        return {
+            ...response,
+            data: response.data.map((organization) => {
+                return organization.id === id ? updater(organization) : organization;
+            })
+        };
+    });
+}
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/organizations/billing-information.test.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/organizations/billing-information.test.ts
new file mode 100644
index 000000000..dccdd3395
--- /dev/null
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/organizations/billing-information.test.ts
@@ -0,0 +1,67 @@
+import { describe, expect, it } from 'vitest';
+
+import { getOrganizationBillingInformation, normalizeOrganizationBillingInformationValue, organizationBillingInformationDataKeys } from './billing-information';
+
+describe('getOrganizationBillingInformation', () => {
+    it('returns billing information from known organization data keys', () => {
+        // Arrange
+        const organization = {
+            data: {
+                [organizationBillingInformationDataKeys.address]: '123 Main Street',
+                [organizationBillingInformationDataKeys.name]: 'Acme, Inc.',
+                [organizationBillingInformationDataKeys.vatId]: 'DE123456789',
+                [organizationBillingInformationDataKeys.vatNumber]: '123456789'
+            }
+        };
+
+        // Act
+        const billingInformation = getOrganizationBillingInformation(organization);
+
+        // Assert
+        expect(billingInformation).toEqual({
+            address: '123 Main Street',
+            name: 'Acme, Inc.',
+            vatId: 'DE123456789',
+            vatNumber: '123456789'
+        });
+    });
+
+    it('defaults missing or non-string billing information values to empty strings', () => {
+        // Arrange
+        const organization = {
+            data: {
+                [organizationBillingInformationDataKeys.address]: ['invalid'],
+                [organizationBillingInformationDataKeys.name]: null,
+                [organizationBillingInformationDataKeys.vatId]: undefined,
+                [organizationBillingInformationDataKeys.vatNumber]: 42
+            }
+        };
+
+        // Act
+        const billingInformation = getOrganizationBillingInformation(organization);
+
+        // Assert
+        expect(billingInformation).toEqual({
+            address: '',
+            name: '',
+            vatId: '',
+            vatNumber: ''
+        });
+    });
+});
+
+describe('normalizeOrganizationBillingInformationValue', () => {
+    it('trims non-empty values and removes blank values', () => {
+        // Arrange
+        const value = '  DE123456789  ';
+        const blankValue = '   ';
+
+        // Act
+        const normalizedValue = normalizeOrganizationBillingInformationValue(value);
+        const normalizedBlankValue = normalizeOrganizationBillingInformationValue(blankValue);
+
+        // Assert
+        expect(normalizedValue).toBe('DE123456789');
+        expect(normalizedBlankValue).toBeNull();
+    });
+});
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/organizations/billing-information.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/organizations/billing-information.ts
new file mode 100644
index 000000000..0be8fee37
--- /dev/null
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/organizations/billing-information.ts
@@ -0,0 +1,35 @@
+import type { ViewOrganization } from './models';
+
+export const organizationBillingInformationDataKeys = {
+    address: 'billing_address',
+    name: 'billing_name',
+    vatId: 'billing_vat_id',
+    vatNumber: 'billing_vat_number'
+} as const;
+
+export interface OrganizationBillingInformation {
+    address: string;
+    name: string;
+    vatId: string;
+    vatNumber: string;
+}
+
+export function getOrganizationBillingInformation(organization?: null | Pick<ViewOrganization, 'data'>): OrganizationBillingInformation {
+    const data = organization?.data;
+
+    return {
+        address: getOrganizationBillingInformationValue(data?.[organizationBillingInformationDataKeys.address]),
+        name: getOrganizationBillingInformationValue(data?.[organizationBillingInformationDataKeys.name]),
+        vatId: getOrganizationBillingInformationValue(data?.[organizationBillingInformationDataKeys.vatId]),
+        vatNumber: getOrganizationBillingInformationValue(data?.[organizationBillingInformationDataKeys.vatNumber])
+    };
+}
+
+export function normalizeOrganizationBillingInformationValue(value: string): null | string {
+    const trimmedValue = value.trim();
+    return trimmedValue || null;
+}
+
+function getOrganizationBillingInformationValue(value: unknown): string {
+    return typeof value === 'string' ? value : '';
+}
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/organizations/schemas.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/organizations/schemas.ts
index c380dca5e..0ac569108 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/organizations/schemas.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/organizations/schemas.ts
@@ -4,6 +4,14 @@ import { SuspensionCode } from './models';
 
 export { type NewOrganizationFormData, NewOrganizationSchema } from '$generated/schemas';
 
+export const OrganizationBillingInformationSchema = object({
+    address: string(),
+    name: string(),
+    vatId: string(),
+    vatNumber: string()
+});
+export type OrganizationBillingInformationFormData = Infer<typeof OrganizationBillingInformationSchema>;
+
 export const SetBonusOrganizationSchema = object({
     bonusEvents: number().int('Bonus events must be a whole number'),
     expires: date().optional()
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/shared/table.svelte.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/shared/table.svelte.ts
index 0805c8099..f08d45921 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/shared/table.svelte.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/shared/table.svelte.ts
@@ -376,19 +376,6 @@ export function resolveConfiguredTableOptions<TData extends RowData>(
     return baseOptions;
 }
 
-export function withClientSortedRowModel<TData extends RowData>(options: TableOptions<StockFeatures, TData>): TableOptions<StockFeatures, TData> {
-    const features = tableFeatures({
-        ...options.features,
-        sortedRowModel: createSortedRowModel<StockFeatures, TData>(),
-        sortFns
-    });
-
-    return {
-        ...options,
-        features
-    };
-}
-
 export function resolvePageCount(
     strategy: PaginationStrategy,
     meta: QueryMeta | undefined,
@@ -438,6 +425,19 @@ export function resolvePaginationChange(previousPageInfo: PaginationState, curre
     };
 }
 
+export function withClientSortedRowModel<TData extends RowData>(options: TableOptions<StockFeatures, TData>): TableOptions<StockFeatures, TData> {
+    const features = tableFeatures({
+        ...options.features,
+        sortedRowModel: createSortedRowModel<StockFeatures, TData>(),
+        sortFns
+    });
+
+    return {
+        ...options,
+        features
+    };
+}
+
 function createPersistedTableState<T>(key: string, initialValue: T): [() => T, (updater: Updater<T>) => void] {
     const persistedValue = new PersistedState<T>(key, initialValue);
 
diff --git a/src/Exceptionless.Web/ClientApp/src/routes/(app)/organization/[organizationId]/billing/+page.svelte b/src/Exceptionless.Web/ClientApp/src/routes/(app)/organization/[organizationId]/billing/+page.svelte
index da1aa1f9f..fecd1c2fd 100644
--- a/src/Exceptionless.Web/ClientApp/src/routes/(app)/organization/[organizationId]/billing/+page.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/routes/(app)/organization/[organizationId]/billing/+page.svelte
@@ -1,26 +1,48 @@
 <script lang="ts">
     import { resolve } from '$app/paths';
+    import { page } from '$app/state';
     import ErrorMessage from '$comp/error-message.svelte';
     import DateTime from '$comp/formatters/date-time.svelte';
-    import { A } from '$comp/typography';
+    import { A, Muted } from '$comp/typography';
     import { Button } from '$comp/ui/button';
     import * as DropdownMenu from '$comp/ui/dropdown-menu';
+    import * as Field from '$comp/ui/field';
+    import { Input } from '$comp/ui/input';
     import { Skeleton } from '$comp/ui/skeleton';
     import * as Table from '$comp/ui/table';
+    import { Textarea } from '$comp/ui/textarea';
     import { env } from '$env/dynamic/public';
     import { ChangePlanDialog } from '$features/billing';
-    import { getInvoicesQuery, getOrganizationQuery } from '$features/organizations/api.svelte';
-    import { organization } from '$features/organizations/context.svelte';
+    import { deleteOrganizationData, getInvoicesQuery, getOrganizationQuery, postOrganizationData } from '$features/organizations/api.svelte';
+    import {
+        getOrganizationBillingInformation,
+        normalizeOrganizationBillingInformationValue,
+        organizationBillingInformationDataKeys
+    } from '$features/organizations/billing-information';
+    import { type OrganizationBillingInformationFormData, OrganizationBillingInformationSchema } from '$features/organizations/schemas';
+    import { ariaInvalid, getFormErrorMessages, getProblemMessage, mapFieldErrors } from '$features/shared/validation';
     import GlobalUser from '$features/users/components/global-user.svelte';
     import CreditCard from '@lucide/svelte/icons/credit-card';
     import File from '@lucide/svelte/icons/file';
     import MoreHorizontal from '@lucide/svelte/icons/more-horizontal';
+    import { createForm } from '@tanstack/svelte-form';
     import { queryParamsState } from 'kit-query-params';
+    import { onDestroy } from 'svelte';
+    import { toast } from 'svelte-sonner';
+    import { debounce } from 'throttle-debounce';
 
+    const billingInformationFields = [
+        { key: organizationBillingInformationDataKeys.name, name: 'name' },
+        { key: organizationBillingInformationDataKeys.address, name: 'address' },
+        { key: organizationBillingInformationDataKeys.vatNumber, name: 'vatNumber' },
+        { key: organizationBillingInformationDataKeys.vatId, name: 'vatId' }
+    ] as const;
+
+    const organizationId = $derived(page.params.organizationId || '');
     const organizationQuery = getOrganizationQuery({
         route: {
             get id() {
-                return organization.current;
+                return organizationId;
             }
         }
     });
@@ -28,12 +50,29 @@
     const invoicesQuery = getInvoicesQuery({
         route: {
             get organizationId() {
-                return organization.current!;
+                return organizationId;
+            }
+        }
+    });
+
+    const updateOrganizationData = postOrganizationData({
+        route: {
+            get id() {
+                return organizationId;
+            }
+        }
+    });
+
+    const removeOrganizationData = deleteOrganizationData({
+        route: {
+            get id() {
+                return organizationId;
             }
         }
     });
 
     const canChangePlan = $derived(organizationQuery.isSuccess && !!env.PUBLIC_STRIPE_PUBLISHABLE_KEY);
+    const billingInformation = $derived(getOrganizationBillingInformation(organizationQuery.data));
 
     const params = queryParamsState({
         default: { changePlan: false },
@@ -42,6 +81,55 @@
     });
 
     let changePlanDialogOpen = $state(!!params.changePlan);
+    let toastId = $state<number | string>();
+
+    const form = createForm(() => ({
+        defaultValues: { ...billingInformation } as OrganizationBillingInformationFormData,
+        validators: {
+            onSubmit: OrganizationBillingInformationSchema,
+            onSubmitAsync: async ({ value }) => {
+                if (!organizationId) {
+                    return { form: 'Organization ID is required.' };
+                }
+
+                const currentBillingInformation = getOrganizationBillingInformation(organizationQuery.data);
+                const changedFields = billingInformationFields.filter((field) => value[field.name] !== currentBillingInformation[field.name]);
+                if (changedFields.length === 0) {
+                    return null;
+                }
+
+                toast.dismiss(toastId);
+
+                try {
+                    await Promise.all(
+                        changedFields.map((field) => {
+                            const normalizedValue = normalizeOrganizationBillingInformationValue(value[field.name]);
+                            if (normalizedValue) {
+                                return updateOrganizationData.mutateAsync({ key: field.key, value: normalizedValue });
+                            }
+
+                            return removeOrganizationData.mutateAsync({ key: field.key });
+                        })
+                    );
+
+                    toastId = toast.success('Successfully updated billing information.');
+                    return null;
+                } catch (error: unknown) {
+                    const message = getProblemMessage(error, 'Please try again.');
+                    toastId = toast.error(`Error saving billing information. ${message}`);
+                    return { form: `Error saving billing information. ${message}` };
+                }
+            }
+        }
+    }));
+
+    const debouncedFormSubmit = debounce(1000, (targetOrganizationId: string) => {
+        if (targetOrganizationId === organizationId) {
+            void form.handleSubmit();
+        }
+    });
+
+    onDestroy(() => debouncedFormSubmit.cancel());
 
     function handleChangePlan() {
         changePlanDialogOpen = true;
@@ -62,16 +150,122 @@
     }
 </script>
 
-<div class="space-y-6">
+<div class="flex flex-col gap-6">
+    <Muted>Billing information and invoices</Muted>
+
     {#if organizationQuery.isLoading}
-        <div class="space-y-4">
+        <div class="flex flex-col gap-4">
             <Skeleton class="h-12 w-3/4" />
             <Skeleton class="h-50 w-full" />
         </div>
     {:else if organizationQuery.error}
         <ErrorMessage message="Unable to load organization data." />
     {:else}
-        <div class="space-y-6">
+        <div class="flex flex-col gap-6">
+            <form
+                onsubmit={(e) => {
+                    e.preventDefault();
+                    e.stopPropagation();
+                    void form.handleSubmit();
+                }}
+            >
+                <form.Subscribe selector={(state) => state.errors}>
+                    {#snippet children(errors)}
+                        <ErrorMessage message={getFormErrorMessages(errors)}></ErrorMessage>
+                    {/snippet}
+                </form.Subscribe>
+
+                <Field.Group class="grid gap-5 md:grid-cols-2">
+                    <form.Field name="name">
+                        {#snippet children(field)}
+                            <Field.Field data-invalid={ariaInvalid(field)}>
+                                <Field.Label for={field.name}>Billing name</Field.Label>
+                                <Input
+                                    id={field.name}
+                                    name={field.name}
+                                    type="text"
+                                    placeholder="Acme, Inc."
+                                    value={field.state.value}
+                                    onblur={field.handleBlur}
+                                    oninput={(e) => {
+                                        field.handleChange(e.currentTarget.value);
+                                        debouncedFormSubmit(organizationId);
+                                    }}
+                                    aria-invalid={ariaInvalid(field)}
+                                />
+                                <Field.Error errors={mapFieldErrors(field.state.meta.errors)} />
+                            </Field.Field>
+                        {/snippet}
+                    </form.Field>
+
+                    <form.Field name="vatId">
+                        {#snippet children(field)}
+                            <Field.Field data-invalid={ariaInvalid(field)}>
+                                <Field.Label for={field.name}>VAT ID</Field.Label>
+                                <Input
+                                    id={field.name}
+                                    name={field.name}
+                                    type="text"
+                                    placeholder="DE123456789"
+                                    value={field.state.value}
+                                    onblur={field.handleBlur}
+                                    oninput={(e) => {
+                                        field.handleChange(e.currentTarget.value);
+                                        debouncedFormSubmit(organizationId);
+                                    }}
+                                    aria-invalid={ariaInvalid(field)}
+                                />
+                                <Field.Error errors={mapFieldErrors(field.state.meta.errors)} />
+                            </Field.Field>
+                        {/snippet}
+                    </form.Field>
+
+                    <form.Field name="address">
+                        {#snippet children(field)}
+                            <Field.Field data-invalid={ariaInvalid(field)} class="md:col-span-2">
+                                <Field.Label for={field.name}>Billing address</Field.Label>
+                                <Textarea
+                                    id={field.name}
+                                    name={field.name}
+                                    rows={4}
+                                    placeholder="123 Main Street&#10;Anytown, ST 12345&#10;United States"
+                                    value={field.state.value}
+                                    onblur={field.handleBlur}
+                                    oninput={(e) => {
+                                        field.handleChange(e.currentTarget.value);
+                                        debouncedFormSubmit(organizationId);
+                                    }}
+                                    aria-invalid={ariaInvalid(field)}
+                                />
+                                <Field.Error errors={mapFieldErrors(field.state.meta.errors)} />
+                            </Field.Field>
+                        {/snippet}
+                    </form.Field>
+
+                    <form.Field name="vatNumber">
+                        {#snippet children(field)}
+                            <Field.Field data-invalid={ariaInvalid(field)}>
+                                <Field.Label for={field.name}>VAT number</Field.Label>
+                                <Input
+                                    id={field.name}
+                                    name={field.name}
+                                    type="text"
+                                    placeholder="123456789"
+                                    value={field.state.value}
+                                    onblur={field.handleBlur}
+                                    oninput={(e) => {
+                                        field.handleChange(e.currentTarget.value);
+                                        debouncedFormSubmit(organizationId);
+                                    }}
+                                    aria-invalid={ariaInvalid(field)}
+                                />
+                                <Field.Error errors={mapFieldErrors(field.state.meta.errors)} />
+                            </Field.Field>
+                        {/snippet}
+                    </form.Field>
+                </Field.Group>
+            </form>
+
             <p>
                 You are currently on the
                 {#if canChangePlan}
@@ -87,7 +281,7 @@
             </p>
 
             {#if invoicesQuery.isLoading}
-                <div class="space-y-2">
+                <div class="flex flex-col gap-2">
                     <Skeleton class="h-8 w-full" />
                     <Skeleton class="h-8 w-full" />
                     <Skeleton class="h-8 w-full" />
@@ -129,16 +323,18 @@
                                                     {/snippet}
                                                 </DropdownMenu.Trigger>
                                                 <DropdownMenu.Content align="end">
-                                                    <DropdownMenu.Item onclick={() => handleOpenInvoice(invoice.id)}>
-                                                        <File class="mr-2 size-4" />
-                                                        View Payment
-                                                    </DropdownMenu.Item>
-                                                    <GlobalUser>
-                                                        <DropdownMenu.Item onclick={() => handleViewStripeInvoice(invoice.id)}>
-                                                            <CreditCard class="mr-2 size-4" />
-                                                            View Stripe Invoice
+                                                    <DropdownMenu.Group>
+                                                        <DropdownMenu.Item onclick={() => handleOpenInvoice(invoice.id)}>
+                                                            <File class="mr-2 size-4" />
+                                                            View Payment
                                                         </DropdownMenu.Item>
-                                                    </GlobalUser>
+                                                        <GlobalUser>
+                                                            <DropdownMenu.Item onclick={() => handleViewStripeInvoice(invoice.id)}>
+                                                                <CreditCard class="mr-2 size-4" />
+                                                                View Stripe Invoice
+                                                            </DropdownMenu.Item>
+                                                        </GlobalUser>
+                                                    </DropdownMenu.Group>
                                                 </DropdownMenu.Content>
                                             </DropdownMenu.Root>
                                         </Table.Cell>
diff --git a/tests/Exceptionless.Tests/Controllers/OrganizationControllerTests.cs b/tests/Exceptionless.Tests/Controllers/OrganizationControllerTests.cs
index 68fcdd37c..cdbd82fa0 100644
--- a/tests/Exceptionless.Tests/Controllers/OrganizationControllerTests.cs
+++ b/tests/Exceptionless.Tests/Controllers/OrganizationControllerTests.cs
@@ -1543,6 +1543,55 @@ public Task PatchAsync_AnonymousUser_ReturnsUnauthorized()
         );
     }
 
+    [Fact]
+    public async Task DeleteDataAsync_ExistingKey_RemovesDataKey()
+    {
+        // Arrange
+        await SendRequestAsync(r => r
+            .AsTestOrganizationUser()
+            .Post()
+            .AppendPaths("organizations", SampleDataService.TEST_ORG_ID, "data", "BillingName")
+            .Content(new ValueFromBody<string>("Acme, Inc."))
+            .StatusCodeShouldBeOk()
+        );
+        await RefreshDataAsync();
+
+        // Act
+        await SendRequestAsync(r => r
+            .AsTestOrganizationUser()
+            .Delete()
+            .AppendPaths("organizations", SampleDataService.TEST_ORG_ID, "data", "BillingName")
+            .StatusCodeShouldBeOk()
+        );
+        await RefreshDataAsync();
+
+        // Assert
+        var organization = await _organizationRepository.GetByIdAsync(SampleDataService.TEST_ORG_ID);
+        Assert.NotNull(organization);
+        Assert.False(organization.Data?.ContainsKey("BillingName") ?? false);
+    }
+
+    [Fact]
+    public async Task PostDataAsync_ValidKeyAndValue_PersistsTrimmedData()
+    {
+        // Act
+        await SendRequestAsync(r => r
+            .AsTestOrganizationUser()
+            .Post()
+            .AppendPaths("organizations", SampleDataService.TEST_ORG_ID, "data", "BillingName")
+            .Content(new ValueFromBody<string>("  Acme, Inc.  "))
+            .StatusCodeShouldBeOk()
+        );
+        await RefreshDataAsync();
+
+        // Assert
+        var organization = await _organizationRepository.GetByIdAsync(SampleDataService.TEST_ORG_ID);
+        Assert.NotNull(organization);
+        Assert.NotNull(organization.Data);
+        Assert.True(organization.Data.TryGetValue("BillingName", out var dataValue));
+        Assert.Equal("Acme, Inc.", dataValue);
+    }
+
     [Fact]
     public async Task PatchAsync_EmptyName_ReturnsValidationError()
     {