Improve user-fetching.