Added a check in findUserById that just returns the user model if it already exists, rather than calling getById.