Need to check both userid and Refinery::User

Appears we may have one in one but not the other!