diff --git a/src/de/steamwar/bungeecore/listeners/ChatListener.java b/src/de/steamwar/bungeecore/listeners/ChatListener.java
index cb255d67..a387104b 100644
--- a/src/de/steamwar/bungeecore/listeners/ChatListener.java
+++ b/src/de/steamwar/bungeecore/listeners/ChatListener.java
@@ -163,7 +163,7 @@ public class ChatListener extends BasicListener {
         for(ProxiedPlayer target  : ProxyServer.getInstance().getPlayers()){
             Subserver targetServer = Subserver.getSubserver(target);
             if(targetServer == null || targetServer.getType() != Servertype.ARENA || targetServer.getServer() != target.getServer().getInfo()){
-                if(msg.contains("@" + target.getName())) {
+                if(msg.toLowerCase().contains("@" + target.getName().toLowerCase())) {
                     BungeeCore.send(target, ChatMessageType.CHAT, msg.replace("@" + target.getName(), "§e@" + target.getName() + chatcolor));
                 }else {
                     BungeeCore.send(target, ChatMessageType.CHAT, msg);
@@ -208,7 +208,7 @@ public class ChatListener extends BasicListener {
         else
             last = "";
         for(ProxiedPlayer player : ProxyServer.getInstance().getPlayers()){
-            String name = player.getName();
+            String name = player.getName().replace("@", "");
             if(last.isEmpty() || name.startsWith(last)){
                 suggestions.add(name);
             }
@@ -221,6 +221,7 @@ public class ChatListener extends BasicListener {
                 }
             }
         }
+
     }
 
     @EventHandler