improve display of usernames
one more change
fix changelog after cherry-pick