Agreement form personalization to make expiration date required based on agreement type

We are trying to make the expiration date required only for certain agreement types.

For example, if the user chooses the agreement type "Corporate" they do not need to enter the expiration date.

If the user chooses the agreement type "Federal" they do need to enter the expiration date.

I've tried a lot of combinations but cannot seem to get this to work fully.  It might work when entering a new agreement but then not when changing an existing agreement to a different type.  I used Note 362402.1 for my latest set of personalizations (even though the note is for 11.5.10) but cannot get it to work.