Imp: Take userinfo into account as outlined in #19684

While implementing #19684 the userinfo part was not covered even
it can contain such kind of data.

Providing such data is now possible.
Prepared 2.0.3