fix user-finding logic /cc @OniOni