diff --git a/packages/lib/server-only/field/set-fields-for-template.ts b/packages/lib/server-only/field/set-fields-for-template.ts
index a2097bfae..c1c41de7c 100644
--- a/packages/lib/server-only/field/set-fields-for-template.ts
+++ b/packages/lib/server-only/field/set-fields-for-template.ts
@@ -22,7 +22,7 @@ export type SetFieldsForTemplateOptions = {
   fields: {
     id?: number | null;
     type: FieldType;
-    recipientId: number;
+    signerId: number;
     signerEmail: string;
     pageNumber: number;
     pageX: number;
@@ -182,7 +182,7 @@ export const setFieldsForTemplate = async ({
           recipient: {
             connect: {
               templateId,
-              id: field.recipientId,
+              id: field.signerId,
             },
           },
         },
diff --git a/packages/trpc/server/field-router/router.ts b/packages/trpc/server/field-router/router.ts
index 3e55bcffa..cf3ee5b51 100644
--- a/packages/trpc/server/field-router/router.ts
+++ b/packages/trpc/server/field-router/router.ts
@@ -430,7 +430,7 @@ export const fieldRouter = router({
         teamId,
         fields: fields.map((field) => ({
           id: field.nativeId,
-          recipientId: field.recipientId,
+          signerId: field.recipientId,
           signerEmail: field.signerEmail,
           type: field.type,
           pageNumber: field.pageNumber,
diff --git a/packages/trpc/server/field-router/schema.ts b/packages/trpc/server/field-router/schema.ts
index 126deae7f..b04e03505 100644
--- a/packages/trpc/server/field-router/schema.ts
+++ b/packages/trpc/server/field-router/schema.ts
@@ -139,6 +139,7 @@ export const ZSetFieldsForTemplateRequestSchema = z.object({
       type: z.nativeEnum(FieldType),
       signerEmail: z.string().min(1),
       recipientId: z.number().min(1),
+      signerId: z.number().min(1),
       pageNumber: z.number().min(1),
       pageX: z.number().min(0),
       pageY: z.number().min(0),
diff --git a/packages/ui/primitives/template-flow/add-template-fields.types.ts b/packages/ui/primitives/template-flow/add-template-fields.types.ts
index f744457bc..af11f290b 100644
--- a/packages/ui/primitives/template-flow/add-template-fields.types.ts
+++ b/packages/ui/primitives/template-flow/add-template-fields.types.ts
@@ -11,7 +11,7 @@ export const ZAddTemplateFieldsFormSchema = z.object({
       type: z.nativeEnum(FieldType),
       signerEmail: z.string().min(1),
       signerToken: z.string(),
-      signerId: z.number().optional(),
+      signerId: z.number(),
       recipientId: z.number(),
       pageNumber: z.number().min(1),
       pageX: z.number().min(0),