diff --git a/src/main/java/com/alttd/ctf/events/OnPlayerOnlineStatus.java b/src/main/java/com/alttd/ctf/events/OnPlayerOnlineStatus.java
index 58521a1..24d5028 100644
--- a/src/main/java/com/alttd/ctf/events/OnPlayerOnlineStatus.java
+++ b/src/main/java/com/alttd/ctf/events/OnPlayerOnlineStatus.java
@@ -64,6 +64,7 @@ public class OnPlayerOnlineStatus implements Listener {
             teamPlayer = min.get().addPlayer(player);
         } else {
             teamPlayer = optionalTeamPlayer.get();
+            teamPlayer.getTeam().addToScoreboard(player);
         }
         FighterCreator.createFighter(teamPlayer.getTeam().getColor())
                 .apply(teamPlayer, worldBorderApi, gamePhase, true);
diff --git a/src/main/java/com/alttd/ctf/flag/Flag.java b/src/main/java/com/alttd/ctf/flag/Flag.java
index 4f7a281..13471d1 100644
--- a/src/main/java/com/alttd/ctf/flag/Flag.java
+++ b/src/main/java/com/alttd/ctf/flag/Flag.java
@@ -376,6 +376,7 @@ public class Flag implements Runnable {
         resetFlagCarrier();
         resetFlag();
         wins.clear();
+        gameManager.getTeams().forEach(team -> team.setScore(0));
     }
 
     public void handleCarrierDeathOrDisconnect(Player player) {
diff --git a/src/main/java/com/alttd/ctf/team/Team.java b/src/main/java/com/alttd/ctf/team/Team.java
index a3e8c9b..4de3a94 100644
--- a/src/main/java/com/alttd/ctf/team/Team.java
+++ b/src/main/java/com/alttd/ctf/team/Team.java
@@ -113,7 +113,7 @@ public class Team {
         log.debug("Removed player {} from team with id {}", player.getName(), id);
     }
 
-    private void addToScoreboard(Player player) {
+    public void addToScoreboard(Player player) {
         org.bukkit.scoreboard.Team team = scoreboard.getTeam("ctf_" + id);
         if (team == null) {
             team = scoreboard.registerNewTeam("ctf_" + id);