diff --git a/varo/src/main/java/de/cliffbreak/varo/managers/TeamManager.java b/varo/src/main/java/de/cliffbreak/varo/managers/TeamManager.java
index 52e40db..ccf8a17 100644
--- a/varo/src/main/java/de/cliffbreak/varo/managers/TeamManager.java
+++ b/varo/src/main/java/de/cliffbreak/varo/managers/TeamManager.java
@@ -125,6 +125,12 @@ public class TeamManager {
     public Team getTeamByPlayer(final String player) {
         for (final Team team : this.teams) {
             if (team.hasEntry(player)) {
+                if (team.getName().startsWith("~")) {
+                    for (final Team team2 : this.teams) {
+                        if (team2.getName().equals(team.getName().replace("~", "")))
+                            return team2;
+                    }
+                }
                 return team;
             }
         }