diff --git a/src/components/Map.vue b/src/components/Map.vue
index 26fd3d6..3eca2a9 100644
--- a/src/components/Map.vue
+++ b/src/components/Map.vue
@@ -123,7 +123,7 @@ export default defineComponent({
 		followTarget: {
 			handler(newValue, oldValue) {
 				if (newValue) {
-					this.updateFollow(newValue, !oldValue || newValue.account !== oldValue.account);
+					this.updateFollow(newValue, !oldValue || newValue.name !== oldValue.name);
 				}
 			},
 			deep: true
diff --git a/src/components/sidebar/PlayerList.vue b/src/components/sidebar/PlayerList.vue
index 91cdfe4..1457100 100644
--- a/src/components/sidebar/PlayerList.vue
+++ b/src/components/sidebar/PlayerList.vue
@@ -22,7 +22,7 @@
 				<input v-if="players && searchEnabled" id="players__search" type="text" name="search"
 				       v-model="searchQuery" :placeholder="messagePlayersSearchPlaceholder" @keydown="onKeydown">
 				<RadioList v-if="filteredPlayers.length" aria-labelledby="players-heading">
-					<PlayerListItem v-for="player in filteredPlayers" :key="player.account"
+					<PlayerListItem v-for="player in filteredPlayers" :key="player.name"
 					                :player="player"></PlayerListItem>
 				</RadioList>
 				<div v-else-if="searchQuery" class="section__skeleton">{{ messageSkeletonPlayersSearch }}</div>