diff --git a/common/net/minecraftforge/event/ForgeEventFactory.java b/common/net/minecraftforge/event/ForgeEventFactory.java
index d67cbedde..8158c59d9 100644
--- a/common/net/minecraftforge/event/ForgeEventFactory.java
+++ b/common/net/minecraftforge/event/ForgeEventFactory.java
@@ -75,4 +75,11 @@ public class ForgeEventFactory
         MinecraftForge.EVENT_BUS.post(maxCanSpawnEvent);
         return maxCanSpawnEvent.getResult() == Result.ALLOW ? maxCanSpawnEvent.maxPackSize : entity.getMaxSpawnedInChunk();
     }
+
+    public static String getPlayerDisplayName(EntityPlayer player, String username)
+    {
+        PlayerEvent.NameFormat event = new PlayerEvent.NameFormat(player, username);
+        MinecraftForge.EVENT_BUS.post(event);
+        return event.displayname;
+    }
 }
diff --git a/common/net/minecraftforge/event/entity/player/PlayerEvent.java b/common/net/minecraftforge/event/entity/player/PlayerEvent.java
index a63f07492..8100318de 100644
--- a/common/net/minecraftforge/event/entity/player/PlayerEvent.java
+++ b/common/net/minecraftforge/event/entity/player/PlayerEvent.java
@@ -45,4 +45,16 @@ public class PlayerEvent extends LivingEvent
             this.newSpeed = original;
         }
     }
+
+    public static class NameFormat extends PlayerEvent
+    {
+        public final String username;
+        public String displayname;
+
+        public NameFormat(EntityPlayer player, String username) {
+            super(player);
+            this.username = username;
+            this.displayname = username;
+        }
+    }
 }
diff --git a/patches/minecraft/net/minecraft/entity/player/EntityPlayer.java.patch b/patches/minecraft/net/minecraft/entity/player/EntityPlayer.java.patch
index a1d0e4a84..d5fd44adc 100644
--- a/patches/minecraft/net/minecraft/entity/player/EntityPlayer.java.patch
+++ b/patches/minecraft/net/minecraft/entity/player/EntityPlayer.java.patch
@@ -543,3 +543,12 @@
      }
  
      @SideOnly(Side.CLIENT)
+@@ -2235,7 +2438,7 @@
+      */
+     public String getTranslatedEntityName()
+     {
+-        return ScorePlayerTeam.formatPlayerName(this.getTeam(), this.username);
++        return ScorePlayerTeam.formatPlayerName(this.getTeam(), ForgeEventFactory.getPlayerDisplayName(this, this.username));
+     }
+ 
+     public void func_110149_m(float par1)