Fix user checking