Fix EmailTemplate