Fixing the find of user by ID or email