Allow Email field to be used as the Sender email address in old forms