Issue #19304 Fix userinfo endpoint to work with changes.