Email template upgrade
Minor bug fixed