diff --git a/src/structure/components/com_sportsmanager/views/sportsmanager/view_admin.php b/src/structure/components/com_sportsmanager/views/sportsmanager/view_admin.php
index b5d13e4..12138e6 100644
--- a/src/structure/components/com_sportsmanager/views/sportsmanager/view_admin.php
+++ b/src/structure/components/com_sportsmanager/views/sportsmanager/view_admin.php
@@ -9851,9 +9851,8 @@ class HTML_sportsmanager_admin
                                                         name="team_id_<?php echo $teamnr; ?>" size="1"
                                                         aria-label="<?php echo Text::_('COM_SPORTSMANAGER_ARIA_LABEL_PAIRING_TEAM'); ?>">
                                                     <?php
-                                                    echo "<option value=\"".$rows[$teamnr-1]->team_id."\">".$rows[$teamnr-1]->teamname."</option>";
                                                     foreach ($rows as $team)
-                                                        echo "<option value=\"" . $team->team_id . "\">" . htmlentities_utf8($team->teamname) . "</option>";
+														echo "<option value=\"" . $team->team_id . "\" ". ($rows[$teamnr - 1]->team_id == $team->team_id ? " selected" : "") . ">" . htmlentities_utf8($team->teamname) . "</option>";
                                                     ?>
                                                 </select>
                                                 <?php
@@ -9863,9 +9862,8 @@ class HTML_sportsmanager_admin
                                                                 name="team_id_<?php echo $teamnr + 1; ?>" size="1"
                                                                 aria-label="<?php echo Text::_('COM_SPORTSMANAGER_ARIA_LABEL_PAIRING_TEAM'); ?>">
                                                         <?php
-                                                        echo "<option value=\"".$rows[$teamnr]->team_id."\">".$rows[$teamnr]->teamname."</option>";
                                                         foreach ($rows as $team)
-                                                            echo "<option value=\"" . $team->team_id . "\">" . htmlentities_utf8($team->teamname) . "</option>";
+															echo "<option value=\"" . $team->team_id . "\" ". ($rows[$teamnr]->team_id == $team->team_id ? " selected" : "") . ">" . htmlentities_utf8($team->teamname) . "</option>";
                                                         ?>
                                                     </select>
                                                     <?php