fixed more email templates
merge fix