Issue #1852746 by bogeyman: Fixed [user] is always added to user names, changed to only display when necessary.