modified email_setting and email_template