Yup on the transaction I have the Custom Form visible and it is the correct one, and when I go to customize form I've made sure the email template is selected and saved there as well.