diff --git a/otp/avatar/Avatar.py b/otp/avatar/Avatar.py
index fdae7e63..a8317b93 100755
--- a/otp/avatar/Avatar.py
+++ b/otp/avatar/Avatar.py
@@ -226,6 +226,8 @@ class Avatar(Actor, ShadowCaster):
     def setNametagName(self, name=None):
         if not name:
             name = self.name
+        
+        self.nametag.setName(name)
 
         if hasattr(self, 'adminAccess') and self.isAdmin():
             access = self.getAdminAccess()
@@ -233,7 +235,7 @@ class Avatar(Actor, ShadowCaster):
             if access in OTPLocalizer.AccessToString:
                 name += '\n\x01shadow\x01%s\x02' % OTPLocalizer.AccessToString[access]
 
-        self.nametag.setName(name)
+        self.nametag.setDisplayName(name)
 
     def getFont(self):
         return self.__font