Added ability to disable email template data