diff --git a/packages/features/ee/dsync/components/ConfigureDirectorySync.tsx b/packages/features/ee/dsync/components/ConfigureDirectorySync.tsx
index b008b50f54..c8d4f7bcd3 100644
--- a/packages/features/ee/dsync/components/ConfigureDirectorySync.tsx
+++ b/packages/features/ee/dsync/components/ConfigureDirectorySync.tsx
@@ -94,7 +94,11 @@ const ConfigureDirectorySync = ({ organizationId }: { organizationId: number | n
                 </div>
                 <DialogFooter showDivider>
                   <DialogClose />
-                  <Button color="primary" data-testid="delete-account-confirm" onClick={onDeleteConfirmation}>
+                  <Button
+                    color="primary"
+                    data-testid="delete-account-confirm"
+                    onClick={onDeleteConfirmation}
+                    loading={deleteMutation.isPending}>
                     {t("directory_sync_delete_connection")}
                   </Button>
                 </DialogFooter>
diff --git a/packages/features/ee/dsync/components/CreateDirectory.tsx b/packages/features/ee/dsync/components/CreateDirectory.tsx
index 71def416ad..557032ea5d 100644
--- a/packages/features/ee/dsync/components/CreateDirectory.tsx
+++ b/packages/features/ee/dsync/components/CreateDirectory.tsx
@@ -57,7 +57,7 @@ const CreateDirectory = ({ orgId }: { orgId: number | null }) => {
             handleSubmit={(values) => {
               mutation.mutate({
                 ...values,
-                orgId,
+                organizationId: orgId,
               });
             }}>
             <div className="mb-5 mt-1">
@@ -112,7 +112,7 @@ const CreateDirectory = ({ orgId }: { orgId: number | null }) => {
                 tabIndex={-1}>
                 {t("cancel")}
               </Button>
-              <Button type="submit" loading={form.formState.isSubmitting}>
+              <Button type="submit" loading={form.formState.isSubmitting || mutation.isPending}>
                 {t("save")}
               </Button>
             </DialogFooter>
diff --git a/packages/trpc/server/routers/viewer/dsync/create.handler.ts b/packages/trpc/server/routers/viewer/dsync/create.handler.ts
index 419d677c55..f143af0361 100644
--- a/packages/trpc/server/routers/viewer/dsync/create.handler.ts
+++ b/packages/trpc/server/routers/viewer/dsync/create.handler.ts
@@ -18,10 +18,10 @@ type Options = {
 
 // Create directory sync connection for a team
 export const createHandler = async ({ ctx, input }: Options) => {
-  const { orgId } = input;
+  const { organizationId } = input;
   const { dsyncController } = await jackson();
 
-  const { message, access } = await canAccess(ctx.user, orgId);
+  const { message, access } = await canAccess(ctx.user, organizationId);
 
   if (!access) {
     throw new TRPCError({
@@ -30,7 +30,7 @@ export const createHandler = async ({ ctx, input }: Options) => {
     });
   }
 
-  const tenant = orgId ? `${tenantPrefix}${orgId}` : (samlTenantID as string);
+  const tenant = organizationId ? `${tenantPrefix}${organizationId}` : (samlTenantID as string);
 
   const { data, error } = await dsyncController.directories.create({
     tenant,
@@ -48,7 +48,7 @@ export const createHandler = async ({ ctx, input }: Options) => {
     data: {
       directoryId: data.id,
       tenant,
-      ...(orgId && { orgId }),
+      ...(organizationId && { organizationId }),
     },
   });
 
diff --git a/packages/trpc/server/routers/viewer/dsync/create.schema.ts b/packages/trpc/server/routers/viewer/dsync/create.schema.ts
index dd8e2e0bb6..b396de829b 100644
--- a/packages/trpc/server/routers/viewer/dsync/create.schema.ts
+++ b/packages/trpc/server/routers/viewer/dsync/create.schema.ts
@@ -1,7 +1,7 @@
 import { z } from "zod";
 
 export const ZCreateInputSchema = z.object({
-  orgId: z.union([z.number(), z.null()]),
+  organizationId: z.union([z.number(), z.null()]),
   name: z.string(),
   provider: z.string(),
 });
diff --git a/packages/trpc/server/routers/viewer/dsync/delete.handler.ts b/packages/trpc/server/routers/viewer/dsync/delete.handler.ts
index d4ce02d61f..93650e47f5 100644
--- a/packages/trpc/server/routers/viewer/dsync/delete.handler.ts
+++ b/packages/trpc/server/routers/viewer/dsync/delete.handler.ts
@@ -27,7 +27,7 @@ export const deleteHandler = async ({ ctx, input }: Options) => {
     });
   }
 
-  await prisma.dSyncData.delete({
+  await prisma.dSyncData.deleteMany({
     where: {
       organizationId: input.organizationId || undefined,
     },