Updated email forms for new mappings.