Added validation and replace email with name