Updated template e-mail and fixed multiple e-mail bug