added email validation
removed templates