diff --git a/src/de/steamwar/bungeecore/listeners/ConnectionListener.java b/src/de/steamwar/bungeecore/listeners/ConnectionListener.java
index bc615690..0deb4687 100644
--- a/src/de/steamwar/bungeecore/listeners/ConnectionListener.java
+++ b/src/de/steamwar/bungeecore/listeners/ConnectionListener.java
@@ -61,7 +61,6 @@ public class ConnectionListener extends BasicListener {
         SteamwarUser user = SteamwarUser.get(player.getUniqueId());
 
         player.removeGroups("Admin", "team");
-        player.setDisplayName(player.getName());
 
         if(user.getUserGroup().isAdminGroup())
             player.addGroups(ADMIN_GROUP);
@@ -76,6 +75,8 @@ public class ConnectionListener extends BasicListener {
             player.setPermission(YOUTUBER_MODS, true);
             player.setDisplayName(user.getUserGroup().getColorCode() + user.getUserGroup().name() + " " + player.getName() + "§r");
             player.setPermission("bungeecore.group." + user.getUserGroup().name().toLowerCase(), true);
+        }else {
+            player.setDisplayName(player.getName());
         }
 
         for(Subserver subserver : Subserver.getServerList()){