diff --git a/packages/ui/primitives/template-flow/add-template-placeholder-recipients.tsx b/packages/ui/primitives/template-flow/add-template-placeholder-recipients.tsx
index 87ec48ad1..b561d3ef7 100644
--- a/packages/ui/primitives/template-flow/add-template-placeholder-recipients.tsx
+++ b/packages/ui/primitives/template-flow/add-template-placeholder-recipients.tsx
@@ -80,6 +80,7 @@ export const AddTemplatePlaceholderRecipientsFormPartial = ({
     append: appendSigner,
     fields: signers,
     remove: removeSigner,
+    update: updateSigner,
   } = useFieldArray({
     control,
     name: 'signers',
@@ -97,7 +98,15 @@ export const AddTemplatePlaceholderRecipientsFormPartial = ({
   };
 
   const onRemoveSigner = (index: number) => {
+    for (let i = index; i < signers.length; i++) {
+      updateSigner(i, {
+        ...signers[i],
+        name: `Recipient ${i}`,
+        email: `recipient.${i}@documenso.com`,
+      });
+    }
     removeSigner(index);
+    setPlaceholderRecipientCount((count) => count - 1);
   };
 
   return (