diff --git a/src/app/components/player-display/player-display.component.ts b/src/app/components/player-display/player-display.component.ts
index fa3f848..faf97f4 100644
--- a/src/app/components/player-display/player-display.component.ts
+++ b/src/app/components/player-display/player-display.component.ts
@@ -12,15 +12,24 @@ import {MatTooltip} from '@angular/material/tooltip';
   styleUrls: ['./player-display.component.scss'],
   template: `
     @let substitute = getSubstituteForEvent(player, event);
-    <span [class.has-substitute]="substitute"
-          [matTooltip]="substitute ? 'Valt in voor ' + (player | fullName) : ''"
-          matTooltipPosition="below">{{ substitute || (player | fullName) }}</span>
+    @if (exlicitSubstitute) {
+      @if (substitute) {
+        {{ substitute }} (valt in voor {{ player | fullName }})
+      } @else {
+        {{ player | fullName }}
+      }
+    } @else {
+      <span [class.has-substitute]="substitute"
+            [matTooltip]="substitute ? 'Valt in voor ' + (player | fullName) : ''"
+            matTooltipPosition="below">{{ substitute || (player | fullName) }}</span>
+    }
   `
 })
 export class PlayerDisplayComponent {
   @Input({ required: true }) player!: Player;
   @Input({ required: true }) event!: Event;
   @Input({ required: true }) tournament!: Tournament;
+  @Input({ required: false }) exlicitSubstitute: boolean = false;
 
   getSubstituteForEvent(player: Player, event: Event): string | undefined {
     const tournamentPlayer = this.tournament.tournamentPlayers.find(
diff --git a/src/app/components/round-overview/round-overview.component.html b/src/app/components/round-overview/round-overview.component.html
index 969c0e9..f3da1d9 100644
--- a/src/app/components/round-overview/round-overview.component.html
+++ b/src/app/components/round-overview/round-overview.component.html
@@ -108,7 +108,8 @@
                 [team]="entry.team"
                 [event]="this.event"
                 [tournament]="this.tournament"
-                [inline]="true">
+                [inline]="true"
+                [explicitSubstitute]="true">
               </app-team-display>
             </td>
             <td class="align-middle">{{ entry.played }}</td>
diff --git a/src/app/components/team-display/team-display.component.ts b/src/app/components/team-display/team-display.component.ts
index 5b3757f..260cc72 100644
--- a/src/app/components/team-display/team-display.component.ts
+++ b/src/app/components/team-display/team-display.component.ts
@@ -12,7 +12,8 @@ import {Team} from "../../model/team";
     <app-player-display
       [player]="team.player1"
       [event]="event"
-      [tournament]="tournament">
+      [tournament]="tournament"
+      [exlicitSubstitute]="explicitSubstitute">
     </app-player-display>
 
     @if (event.doublesEvent && team.player2) {
@@ -34,4 +35,5 @@ export class TeamDisplayComponent {
   @Input({ required: true }) event!: Event;
   @Input({ required: true }) tournament!: Tournament;
   @Input({ required: false }) inline: boolean = true;
+  @Input({ required: false }) explicitSubstitute: boolean = false;
 }
diff --git a/src/app/components/tournament-manage/tournament-manage.component.html b/src/app/components/tournament-manage/tournament-manage.component.html
index 0a5aa60..4f47ddb 100644
--- a/src/app/components/tournament-manage/tournament-manage.component.html
+++ b/src/app/components/tournament-manage/tournament-manage.component.html
@@ -437,7 +437,14 @@
                                 @for (entry of getStandingsForRound(round, group).entries; track entry.position) {
                                   <tr>
                                     <td class="align-middle">{{ entry.position }}</td>
-                                    <td class="align-middle">{{ entry.team | teamText }}</td>
+                                    <td class="align-middle">
+                                      <app-team-display
+                                        [team]="entry.team"
+                                        [event]="event"
+                                        [tournament]="this.tournament"
+                                        [inline]="true">
+                                      </app-team-display>
+                                    </td>
                                     <td class="align-middle">{{ entry.played }}</td>
                                     <td class="align-middle">
                                       @if (entry.played > 0 ) {