diff --git a/src/dashboard/example/components/ScoreboardPanel.vue b/src/dashboard/example/components/ScoreboardPanel.vue
index de90df6..cb6e90a 100644
--- a/src/dashboard/example/components/ScoreboardPanel.vue
+++ b/src/dashboard/example/components/ScoreboardPanel.vue
@@ -70,10 +70,38 @@ const playerOptions = computed(() => {
   return base.concat(options);
 });
 
+const leftPlayerOptions = computed(() => {
+  const options = filterOptions(playerOptions.value, leftFilter.value);
+  if (scoreboardStore.scoreboard.leftPlayerId !== CUSTOM_LEFT_PLAYER_ID) {
+    return options;
+  }
+  return [{
+    value: CUSTOM_LEFT_PLAYER_ID,
+    label: scoreboardStore.scoreboard.leftNameOverride || '(Sin asignar)',
+  }].concat(options);
+});
+
+const rightPlayerOptions = computed(() => {
+  const options = filterOptions(playerOptions.value, rightFilter.value);
+  if (scoreboardStore.scoreboard.rightPlayerId !== CUSTOM_RIGHT_PLAYER_ID) {
+    return options;
+  }
+  return [{
+    value: CUSTOM_RIGHT_PLAYER_ID,
+    label: scoreboardStore.scoreboard.rightNameOverride || '(Sin asignar)',
+  }].concat(options);
+});
+
 const leftSelectedPlayer = computed(() => playersStore.players[scoreboardStore.scoreboard.leftPlayerId]);
 const rightSelectedPlayer = computed(() => playersStore.players[scoreboardStore.scoreboard.rightPlayerId]);
 
 const getPlayerLabel = (playerId: string) => {
+  if (playerId === CUSTOM_LEFT_PLAYER_ID) {
+    return scoreboardStore.scoreboard.leftNameOverride;
+  }
+  if (playerId === CUSTOM_RIGHT_PLAYER_ID) {
+    return scoreboardStore.scoreboard.rightNameOverride;
+  }
   const match = playerOptions.value.find((option) => option.value === playerId);
   return match ? match.label : '';
 };
@@ -135,10 +163,6 @@ const rightHasSelectedPlayerChanges = computed(() => {
     || player.country !== scoreboardStore.scoreboard.rightCountryOverride;
 });
 
-const leftPlayerOptions = computed(() => filterOptions(playerOptions.value, leftFilter.value));
-const rightPlayerOptions = computed(() => filterOptions(playerOptions.value, rightFilter.value));
-
-
 const startLeftCustomPlayer = () => {
   const wasCustom = scoreboardStore.scoreboard.leftPlayerId === CUSTOM_LEFT_PLAYER_ID;
   scoreboardStore.scoreboard.leftPlayerId = CUSTOM_LEFT_PLAYER_ID;