2 files changed, 2 insertions, 2 deletions
diff --git a/source/frontend/StarTeamBar.cpp b/source/frontend/StarTeamBar.cpp
index a378040..f34961b 100644
--- a/source/frontend/StarTeamBar.cpp
+++ b/source/frontend/StarTeamBar.cpp
@@ -132,7 +132,7 @@ void TeamBar::updatePlayerResources() {
     m_energyBar->setColor(m_energyBarColor.mix(m_energyBarRegenMixColor, player->energyRegenBlockPercent()));
   }
 
-  m_nameLabel->setText(m_client->mainPlayer()->name());
+  m_nameLabel->setText(player->name());
 }
 
 void TeamBar::inviteButton() {
diff --git a/source/frontend/StarTeleportDialog.cpp b/source/frontend/StarTeleportDialog.cpp
index 01c6a69..c1ca4b4 100644
--- a/source/frontend/StarTeleportDialog.cpp
+++ b/source/frontend/StarTeleportDialog.cpp
@@ -79,7 +79,7 @@ TeleportDialog::TeleportDialog(UniverseClientPtr client,
   if (config.getBool("includePartyMembers", false)) {
     auto teamClient = m_client->teamClient();
     for (auto member : teamClient->members()) {
-      if (member.uuid == m_client->mainPlayer()->uuid() || member.warpMode == WarpMode::None)
+      if (member.uuid == m_client->clientContext()->playerUuid() || member.warpMode == WarpMode::None)
         continue;
 
       auto entry = destList->addItem();