Added more validation on user registration