If a change to the UserInfo plugin is needed, please include it as part of this pull request.