Intake Forms for 2 clients in the one matter

Hi, is there a way of sending different matter intake forms to 2 different clients in the one matter without the information being deleted?
 

For example, in a Wills, Power of Attorney & Enduring Guardian matter there are some instances where there are husband/wife clients in the same matter and a matter intake form is sent to both clients. My experience is that if Client 1 completes the matter intake form and then Client 2 completes it after, rather than creating two separate mapped intake forms for each client, Client 1’s information is deleted when Client 2 inputs their information and submits the form.

The only work around that I can see is to create two separate matters for each client or I simply don’t use the Matter intake forms, which is obviously not ideal.
 

Any help/ideas would be appreciated!