Fixed email template issue