Improve client/user validations