diff --git a/MinecraftClient/ChatBot.cs b/MinecraftClient/ChatBot.cs
index ebdbcc08..5d568289 100644
--- a/MinecraftClient/ChatBot.cs
+++ b/MinecraftClient/ChatBot.cs
@@ -266,7 +266,7 @@ namespace MinecraftClient
                 //<*Faction Someone> message
                 //<*Faction Someone>: message
                 //<*Faction ~Nicknamed>: message
-                if (text[0] == '<')
+                if (text[0] == '<' && Settings.Vanilla_And_Factions_Messages_Enabled.Equals(true))
                 {
                     try
                     {
diff --git a/MinecraftClient/Settings.cs b/MinecraftClient/Settings.cs
index ee14b0e1..ae231d63 100644
--- a/MinecraftClient/Settings.cs
+++ b/MinecraftClient/Settings.cs
@@ -93,6 +93,7 @@ namespace MinecraftClient
         //Chat Message Enabled / Disabled.
         public static bool Hero_Chat_Messages_Enabled = true;
         public static bool Unknown_Chat_Plugin_Messages_One_Enabled = true;
+        public static bool Vanilla_And_Factions_Messages_Enabled = true;
 
         //Auto Respond
         public static bool AutoRespond_Enabled = false;
@@ -295,7 +296,8 @@ namespace MinecraftClient
                                             {
                                                 case "herochatmessagesenabled": Hero_Chat_Messages_Enabled = str2bool(argValue); break;
                                                 case "unknownchatpluginmessagesone": Unknown_Chat_Plugin_Messages_One_Enabled = str2bool(argValue); break;
-                                                
+                                                case "vanillaandfactionsmessages": Vanilla_And_Factions_Messages_Enabled = str2bool(argValue); break;
+
                                             }
                                             break;
 
@@ -438,6 +440,7 @@ namespace MinecraftClient
                 + "tpaccepteveryone=false\r\n"
                 + "\r\n"
                 + "[ChatBotMessages]\r\n"
+                + "vanillaandfactionsmessages=true # Chat Formats \"<User> Message\" \"<*Faction User>: Message\" \r\n"
                 + "herochatmessagesenabled=true # Chat Format is \"[Channel][Rank] User: Message\"\r\n"
                 + "unknownchatpluginmessagesone=true # Chat Format is \"**Faction<Rank> User : Message\"\r\n"
                 + "\r\n"