fix some toolbar logout username handling