Dynamic Content in Form Submission Emails

We have a registration form set up for webinars.  The form includes a pick list of webinars, including future dates, so we allow for multiple submissions on a CDO with a unique ID as the primary field.  We also have an email set up that includes dynamic content as a trigger when the form is submitted.  It is working correctly the majority of the time, however we run into some instances where the dynamic content is still using older information.  This seems to happen because the key field needs to be overridden to be email, so if there are multiple