Added proper email and name validation