Fix for a bug in find_user introduced by 4a2c05446f9245dfa828f4f8dc6655180f7ec1cb - changed the order of find and where clauses.