Adobe Sign Salesforce Variable Number of Recipients

This relates to my question the other day but is slightly different.

I set up a template with two participants: a client signer (participant 1) and a signer at the company  (participant 2) originating the document. In some scenarios, two client signers may sign before the company signer. When launching Adobe Sign in Salesforce, if I add a second client signer before the company signer, the second client signer becomes participant 2. All the fields set up in my template for participant 2 (meant for the company signer) will now be expected to be completed by the second client signer.

I can have the users manually change the assigned fields in the template before sending, but if they miss a field, the field meant for the company to sign will now be assigned to the second client signer. This seems error-prone.

Is there an elegant way to handle a variable number of recipients with templates?