diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/packet/PlayerListItem.java b/protocol/src/main/java/net/md_5/bungee/protocol/packet/PlayerListItem.java
index ff597686..71ca74bc 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/packet/PlayerListItem.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/packet/PlayerListItem.java
@@ -91,7 +91,7 @@ public class PlayerListItem extends DefinedPacket
         if ( protocolVersion < ProtocolConstants.MINECRAFT_SNAPSHOT )
         {
             Item item = items[0]; // Only one at a time
-            writeString( TextComponent.toLegacyText( ComponentSerializer.parse( item.displayName ) ), buf );
+            writeString( item.displayName, buf ); // TODO: Server unique only!
             buf.writeBoolean( action != Action.REMOVE_PLAYER );
             buf.writeShort( item.ping );
         } else
diff --git a/proxy/src/main/java/net/md_5/bungee/UserConnection.java b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
index b85b9cd9..91642267 100644
--- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
+++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
@@ -131,7 +131,8 @@ public final class UserConnection implements ProxiedPlayer
 
         this.displayName = name;
 
-        switch ( getPendingConnection().getListener().getTabListType() )
+        // Blame Mojang for this one
+        /*switch ( getPendingConnection().getListener().getTabListType() )
         {
             case "GLOBAL":
                 tabListHandler = new Global( this );
@@ -142,7 +143,8 @@ public final class UserConnection implements ProxiedPlayer
             default:
                 tabListHandler = new GlobalPing( this );
                 break;
-        }
+        }*/
+        tabListHandler = new ServerUnique( this );
 
         Collection<String> g = bungee.getConfigurationAdapter().getGroups( name );
         for ( String s : g )