Update to use latest user-api-client