Added some validations for users