Added more validation for users.