Hi Chris,
I ran into the same issue. To fix, I created a brand new field merge in the component library and added it to the contact field on the form. The link won't change. Previously, with the regular Email Adress field merge it was only populating the form submissions with <span class="eloquaemail">EmailAddress</span>.