diff --git a/src/de/steamwar/bungeecore/commands/BauCommand.java b/src/de/steamwar/bungeecore/commands/BauCommand.java
index 3c388366..a0d120fb 100644
--- a/src/de/steamwar/bungeecore/commands/BauCommand.java
+++ b/src/de/steamwar/bungeecore/commands/BauCommand.java
@@ -134,7 +134,7 @@ public class BauCommand {
 
         ProxiedPlayer z = ProxyServer.getInstance().getPlayer(target.getUuid());
         if(z != null)
-            Message.send("BAU_ADDMEMBER_ADDED_TARGET", p, p.getName());
+            Message.send("BAU_ADDMEMBER_ADDED_TARGET", z, p.getName());
     }
 
     private static void teleport(ProxiedPlayer p, String[] command){
@@ -316,11 +316,11 @@ public class BauCommand {
 
         if(permission){
             if(player != null)
-                Message.send("BAU_MEMBER_TOGGLE_TARGET", p, p.getName(), what);
+                Message.send("BAU_MEMBER_TOGGLE_TARGET", player, p.getName(), what);
             Message.send("BAU_MEMBER_TOGGLE", p, what);
         }else{
             if(player != null)
-                Message.send("BAU_MEMBER_TOGGLE_TARGET_OFF", p, p.getName(), what);
+                Message.send("BAU_MEMBER_TOGGLE_TARGET_OFF", player, p.getName(), what);
             Message.send("BAU_MEMBER_TOGGLE_OFF", p, what);
         }
     }
diff --git a/src/de/steamwar/bungeecore/commands/MsgCommand.java b/src/de/steamwar/bungeecore/commands/MsgCommand.java
index fde3244a..8ec0d386 100644
--- a/src/de/steamwar/bungeecore/commands/MsgCommand.java
+++ b/src/de/steamwar/bungeecore/commands/MsgCommand.java
@@ -72,8 +72,8 @@ public class MsgCommand extends BasicCommand {
             for (int i = 1; i < args.length; i++){
                 msgBuilder.append(args[i]).append(" ");
             }
-            Message.send("MSG_FORMAT", player, player.getName(), target.getName(), msgBuilder.toString());
-            Message.send("MSG_FORMAT", target, player.getName(), target.getName(), msgBuilder.toString());
+            Message.sendPrefixless("MSG_FORMAT", player, player.getName(), target.getName(), msgBuilder.toString());
+            Message.sendPrefixless("MSG_FORMAT", target, player.getName(), target.getName(), msgBuilder.toString());
             BungeeCore.log(Message.parse("MSG_FORMAT", player, player.getName(), target.getName(), msgBuilder.toString()));
 
             lastChats.put(player, target);
diff --git a/src/de/steamwar/bungeecore/commands/RCommand.java b/src/de/steamwar/bungeecore/commands/RCommand.java
index 17b87b72..fef00317 100644
--- a/src/de/steamwar/bungeecore/commands/RCommand.java
+++ b/src/de/steamwar/bungeecore/commands/RCommand.java
@@ -69,8 +69,8 @@ public class RCommand extends BasicCommand {
             for (String arg : args){
                 msgBuilder.append(arg).append(" ");
             }
-            Message.send("MSG_FORMAT", player, player.getName(), target.getName(), msgBuilder.toString());
-            Message.send("MSG_FORMAT", target, player.getName(), target.getName(), msgBuilder.toString());
+            Message.sendPrefixless("MSG_FORMAT", player, player.getName(), target.getName(), msgBuilder.toString());
+            Message.sendPrefixless("MSG_FORMAT", target, player.getName(), target.getName(), msgBuilder.toString());
             BungeeCore.log(Message.parse("MSG_FORMAT", player, player.getName(), target.getName(), msgBuilder.toString()));
 
             lastChats.put(target, player);
diff --git a/src/de/steamwar/messages/BungeeCore.properties b/src/de/steamwar/messages/BungeeCore.properties
index 6679b9b2..4ed6107e 100644
--- a/src/de/steamwar/messages/BungeeCore.properties
+++ b/src/de/steamwar/messages/BungeeCore.properties
@@ -387,7 +387,7 @@ TEAM_INFO_EVENTS=§7Events§8: §e{0}
 TEAM_LIST_NOT_PAGE=§cKeine Seitenzahl angegeben
 TEAM_LIST_UNKNOWN_PAGE=§cUngültige Seitenzahl angegeben
 TEAM_LIST_HEADER=§7§lTeamliste §7{0}§8/§7{1}
-TEAM_LIST_TEAM=§{0}{1} §e{2} §8[§7{3}}§8]
+TEAM_LIST_TEAM=§{0}{1} §e{2} §8[§7{3}§8]
 TEAM_LIST_TEAM_HOVER=§7Teaminfo
 TEAM_LIST_PAGE=Seite
 TEAM_LIST_NEXT=§eNächste Seite