diff --git a/src/de/steamwar/lobby/display/NPC.java b/src/de/steamwar/lobby/display/NPC.java
index a3b9de8..6c0b563 100644
--- a/src/de/steamwar/lobby/display/NPC.java
+++ b/src/de/steamwar/lobby/display/NPC.java
@@ -178,7 +178,9 @@ public class NPC {
     }
 
     private void show(Player player) {
-        TinyProtocol.instance.sendPacket(player, addPlayerInfo);
+        if (Bukkit.getOnlinePlayers().stream().noneMatch(p -> p.getUniqueId().equals(uuid))) {
+            TinyProtocol.instance.sendPacket(player, addPlayerInfo);
+        }
         TinyProtocol.instance.sendPacket(player, namedSpawn);
         TinyProtocol.instance.sendPacket(player, headRotation);
         TinyProtocol.instance.sendPacket(player, skinParts);
diff --git a/src/de/steamwar/lobby/team/TeamPlayer.java b/src/de/steamwar/lobby/team/TeamPlayer.java
index 047c69a..3b37196 100644
--- a/src/de/steamwar/lobby/team/TeamPlayer.java
+++ b/src/de/steamwar/lobby/team/TeamPlayer.java
@@ -43,7 +43,7 @@ public class TeamPlayer extends BasicListener {
     private static Map<Entity, NPC> entities = new HashMap<>();
 
     public static void spawnTeamPlayer(World world, String name) {
-        Location location = new Location(world, 1524.5, 52, 1493.5);
+        Location location = new Location(world, 1524.5, 52, 1481.5);
         NPC npc = new NPC(location, SteamwarUser.get(name).getUUID(), name);
         Villager villager = (Villager) world.spawnEntity(location, EntityType.VILLAGER);
         villager.setSilent(true);