diff --git a/src/cmd.rs b/src/cmd.rs
index 914d586..7ebb62a 100644
--- a/src/cmd.rs
+++ b/src/cmd.rs
@@ -541,6 +541,7 @@ fn spawn_entities(
     mut materials_jupiter: ResMut<Assets<load::JupitersRing>>,
     mut id2pos: ResMut<game::Id2Pos>,
     mut achievement_tracker: ResMut<var::AchievementTracker>,
+    mut ew_updateavatar: EventWriter<hud::UpdateAvatarEvent>,
     settings: Res<var::Settings>,
 ) {
     for state_wrapper in er_spawn.read() {
@@ -675,6 +676,7 @@ fn spawn_entities(
                     actor.insert(actor::Player);
                     actor.insert(actor::PlayerCamera);
                     actor.insert(hud::AugmentedRealityOverlayBroadcaster);
+                    ew_updateavatar.send(hud::UpdateAvatarEvent);
                 }
                 if state.is_sun {
                     let (r, g, b) = nature::star_color_index_to_rgb(0.656);
diff --git a/src/world.rs b/src/world.rs
index 0c7cd34..0c09de0 100644
--- a/src/world.rs
+++ b/src/world.rs
@@ -357,12 +357,10 @@ fn handle_despawn(
     }
 }
 
-fn handle_respawn(
+pub fn handle_respawn(
     ew_spawn: EventWriter<cmd::SpawnEvent>,
-    mut ew_updateavatar: EventWriter<hud::UpdateAvatarEvent>,
     mut achievement_tracker: ResMut<var::AchievementTracker>,
 ) {
     *achievement_tracker = var::AchievementTracker::default();
     cmd::load_defs(ew_spawn);
-    ew_updateavatar.send(hud::UpdateAvatarEvent);
 }