Fix to show user name if no user name is set