diff --git a/FightSystem_Main/src/de/steamwar/fightsystem/fight/FightTeam.java b/FightSystem_Main/src/de/steamwar/fightsystem/fight/FightTeam.java
index 2dc3fdd..142568e 100644
--- a/FightSystem_Main/src/de/steamwar/fightsystem/fight/FightTeam.java
+++ b/FightSystem_Main/src/de/steamwar/fightsystem/fight/FightTeam.java
@@ -20,6 +20,7 @@
 package de.steamwar.fightsystem.fight;
 
 import com.sk89q.worldedit.EditSession;
+import de.steamwar.comms.packets.TablistNamePacket;
 import de.steamwar.core.Core;
 import de.steamwar.fightsystem.Config;
 import de.steamwar.fightsystem.FightSystem;
@@ -27,7 +28,10 @@ import de.steamwar.fightsystem.IFightSystem;
 import de.steamwar.fightsystem.kit.KitManager;
 import de.steamwar.fightsystem.listener.PersonalKitCreator;
 import de.steamwar.fightsystem.states.FightState;
-import de.steamwar.fightsystem.utils.*;
+import de.steamwar.fightsystem.utils.ColorConverter;
+import de.steamwar.fightsystem.utils.FightScoreboard;
+import de.steamwar.fightsystem.utils.ItemBuilder;
+import de.steamwar.fightsystem.utils.TechHider;
 import de.steamwar.fightsystem.winconditions.RankedPlayerLeftWincondition;
 import de.steamwar.inventory.SWItem;
 import de.steamwar.sql.NoClipboardException;
@@ -178,6 +182,8 @@ public class FightTeam implements IFightTeam{
         if(KitManager.getKits(false).size() > 1 || Config.PersonalKits)
             player.getInventory().setItem(1, new ItemBuilder(Material.LEATHER_CHESTPLATE).removeAllAttributs().addEnchantment(Enchantment.DURABILITY, 1).setDisplayName("§eKit wählen").build());
         player.getInventory().setItem(7, new ItemBuilder(Material.BEACON).removeAllAttributs().setDisplayName("§eRespawn").build());
+        if(!Config.test())
+            new TablistNamePacket(SteamwarUser.get(player.getUniqueId()).getId(), prefix + player.getName()).send(player);
         TechHider.reloadChunks(player, chunksToReload);
         return fightPlayer;
     }
@@ -195,6 +201,8 @@ public class FightTeam implements IFightTeam{
 
         Fight.setPlayerGamemode(player, GameMode.SPECTATOR);
         player.teleport(Config.SpecSpawn);
+        if(!Config.test())
+            new TablistNamePacket(SteamwarUser.get(player.getUniqueId()).getId(), "§7§o" + player.getName()).send(player);
         TechHider.reloadChunks(player, chunksToReload);
     }
 
diff --git a/FightSystem_Main/src/de/steamwar/fightsystem/listener/PlayerStateListener.java b/FightSystem_Main/src/de/steamwar/fightsystem/listener/PlayerStateListener.java
index 8f179e6..56d6c93 100644
--- a/FightSystem_Main/src/de/steamwar/fightsystem/listener/PlayerStateListener.java
+++ b/FightSystem_Main/src/de/steamwar/fightsystem/listener/PlayerStateListener.java
@@ -19,6 +19,7 @@
 
 package de.steamwar.fightsystem.listener;
 
+import de.steamwar.comms.packets.TablistNamePacket;
 import de.steamwar.fightsystem.Config;
 import de.steamwar.fightsystem.FightSystem;
 import de.steamwar.fightsystem.countdown.Countdown;
@@ -27,6 +28,7 @@ import de.steamwar.fightsystem.fight.Fight;
 import de.steamwar.fightsystem.fight.FightPlayer;
 import de.steamwar.fightsystem.fight.FightTeam;
 import de.steamwar.fightsystem.states.FightState;
+import de.steamwar.sql.SteamwarUser;
 import net.md_5.bungee.api.chat.TextComponent;
 import org.bukkit.Bukkit;
 import org.bukkit.GameMode;
@@ -61,6 +63,8 @@ public class PlayerStateListener extends BasicListener{
         if (fightTeam == null) {
             Fight.setPlayerGamemode(player, GameMode.SPECTATOR);
             player.teleport(Config.SpecSpawn);
+            if(!Config.test())
+                new TablistNamePacket(SteamwarUser.get(player.getUniqueId()).getId(), "§7§o" + player.getName()).send(player);
         } else {
             player.teleport(fightTeam.getSpawn());
             if(FightSystem.getFightState().setup())