Fix user info not displayed correctly when group doesn't map cleanly
Merge pull request #3724 from herself/hf-test

Fix user info not displayed correctly when group doesn't map cleanly