Updated email templates to actually work...