Validate against either user_id or user_name

Change-Id: I9067d57078d43f8c08adf5e3d0ec7dbefe68f788