diff --git a/src/de/steamwar/bungeecore/commands/BugCommand.java b/src/de/steamwar/bungeecore/commands/BugCommand.java
index 9648423..91509f0 100644
--- a/src/de/steamwar/bungeecore/commands/BugCommand.java
+++ b/src/de/steamwar/bungeecore/commands/BugCommand.java
@@ -34,6 +34,10 @@ public class BugCommand extends SWCommand {
     public void bugMessage(ProxiedPlayer player, String... message) {
         String server = player.getServer().getInfo().getName();
         SteamwarUser user = SteamwarUser.get(player.getUniqueId());
+        if (message.length == 0) {
+            ChatSender.of(player).system("BUG_NOARGS");
+            return;
+        }
         SWException.log(server, String.join(" ", message), player.getName() + " " + user.getId());
         ChatSender.of(player).system("BUG_MESSAGE");
     }
diff --git a/src/de/steamwar/bungeecore/commands/ToggleLocalChatCommand.java b/src/de/steamwar/bungeecore/commands/ToggleLocalChatCommand.java
new file mode 100644
index 0000000..28cbf50
--- /dev/null
+++ b/src/de/steamwar/bungeecore/commands/ToggleLocalChatCommand.java
@@ -0,0 +1,31 @@
+package de.steamwar.bungeecore.commands;
+
+import de.steamwar.command.SWCommand;
+import de.steamwar.messages.ChatSender;
+import lombok.Getter;
+import net.md_5.bungee.api.connection.ProxiedPlayer;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ToggleLocalChatCommand extends SWCommand {
+    @Getter private static List<ProxiedPlayer> inLocalChat;
+
+    protected ToggleLocalChatCommand() {
+        super("localtoggle", null, "togglelocal", "lt");
+        inLocalChat = new ArrayList<>();
+    }
+
+    @Register
+    public void toggleLocalChat(ProxiedPlayer player) {
+        if (inLocalChat.contains(player)) {
+            inLocalChat.remove(player);
+            ChatSender.of(player).system("LOCALTOGGLE_OFF");
+        } else {
+            inLocalChat.add(player);
+            ChatSender.of(player).system("LOCALTOGGLE_ON");
+        }
+    }
+
+    // Ich habe keine ahnung ob ich das richtig mache
+}
diff --git a/src/de/steamwar/bungeecore/listeners/ChatListener.java b/src/de/steamwar/bungeecore/listeners/ChatListener.java
index 827fe3e..c613ad9 100644
--- a/src/de/steamwar/bungeecore/listeners/ChatListener.java
+++ b/src/de/steamwar/bungeecore/listeners/ChatListener.java
@@ -21,6 +21,7 @@ package de.steamwar.bungeecore.listeners;
 
 import de.steamwar.bungeecore.*;
 import de.steamwar.bungeecore.bot.SteamwarDiscordBot;
+import de.steamwar.bungeecore.commands.ToggleLocalChatCommand;
 import de.steamwar.bungeecore.network.NetworkSender;
 import de.steamwar.bungeecore.sql.*;
 import de.steamwar.bungeecore.util.Chat19;
@@ -69,7 +70,7 @@ public class ChatListener extends BasicListener {
         Subserver subserver = Subserver.getSubserver(player);
         if(subserver != null && subserver.getType() == Servertype.ARENA && subserver.getServer() == player.getServer().getInfo()) {
             localChat(player, message);
-        } else if (message.startsWith("+")) {
+        } else if (message.startsWith("+") || ToggleLocalChatCommand.getInLocalChat().contains(player)) {
             localChat(player, message.substring(1));
         } else {
             sendChat(ChatSender.of(player), ChatSender.globalReceivers(), "CHAT_GLOBAL", null, message);
diff --git a/src/de/steamwar/messages/BungeeCore.properties b/src/de/steamwar/messages/BungeeCore.properties
index 23060c2..ab56353 100644
--- a/src/de/steamwar/messages/BungeeCore.properties
+++ b/src/de/steamwar/messages/BungeeCore.properties
@@ -183,6 +183,7 @@ NOTE_TEAM={0} §e{1} §7received a §e§lnote§7 from §e{2} {3}: §f{4}
 
 #BugCommand
 BUG_MESSAGE=§7Your bugreport was saved.
+BUG_NOARGS=§7Please specify a bug.
 
 #IgnoreCommand
 IGNORE_YOURSELF=§cHow are you going to ignore yourself?
@@ -659,4 +660,8 @@ ADVENT_CALENDAR_TITLE=§eAdvent Calendar
 ADVENT_CALENDAR_DAY=§7Day§8: §e{0}
 ADVENT_CALENDAR_MESSAGE=§eDid you already open your advent calendar?
 ADVENT_CALENDAR_MESSAGE_HOVER=§eClick to open!
-ADVENT_CALENDAR_OPEN=§7You got §e{0} §7from the advent calendar!
\ No newline at end of file
+ADVENT_CALENDAR_OPEN=§7You got §e{0} §7from the advent calendar!
+
+# Toggle Local Chat
+LOCALTOGGLE_ON=§7You toggled §alocal §7chat.
+LOCALTOGGLE_OFF=§7You toggled §aglobal §7chat.
diff --git a/src/de/steamwar/messages/BungeeCore_de.properties b/src/de/steamwar/messages/BungeeCore_de.properties
index f9b11af..abea381 100644
--- a/src/de/steamwar/messages/BungeeCore_de.properties
+++ b/src/de/steamwar/messages/BungeeCore_de.properties
@@ -168,6 +168,7 @@ NOTE_TEAM={0} §e{1} §7erhielt von §e{2} {3} §7die §e§lNotiz§7§8: §f{4}
 
 #BugCommand
 BUG_MESSAGE=§7Dein Bugreport wurde gespeichert.
+BUG_NOARGS=§7Bitte nenne einen Bug.
 
 #IgnoreCommand
 IGNORE_YOURSELF=§cWie willst du dich selber ignorieren?
@@ -635,4 +636,8 @@ ADVENT_CALENDAR_TITLE=§eAdventskalender
 ADVENT_CALENDAR_DAY=§7Tag§8: §e{0}
 ADVENT_CALENDAR_MESSAGE=§eHast du heute schon dein Geschenk geholt?
 ADVENT_CALENDAR_MESSAGE_HOVER=§eKlicken zum öffnen!
-ADVENT_CALENDAR_OPEN=§7Du hast §e{0}§7 aus dem Adventskalender erhalten!
\ No newline at end of file
+ADVENT_CALENDAR_OPEN=§7Du hast §e{0}§7 aus dem Adventskalender erhalten!
+
+# Toggle Local Chat
+LOCALTOGGLE_ON=§7Du bist jetzt im §aLokalen §7Chat.
+LOCALTOGGLE_OFF=§7Du bist jetzt im §aGlobalen §7Chat.
\ No newline at end of file