diff --git a/TShockAPI/ConfigFile.cs b/TShockAPI/ConfigFile.cs
index c5067c19..a39adcf8 100644
--- a/TShockAPI/ConfigFile.cs
+++ b/TShockAPI/ConfigFile.cs
@@ -96,6 +96,7 @@ namespace TShockAPI
 
         public bool EnableDNSHostResolution = false;
 
+        public bool EnableBanOnUsernames = false;
         public static ConfigFile Read(string path)
         {
             if (!File.Exists(path))
diff --git a/TShockAPI/DB/BanManager.cs b/TShockAPI/DB/BanManager.cs
index dfda68e0..b4beb54d 100644
--- a/TShockAPI/DB/BanManager.cs
+++ b/TShockAPI/DB/BanManager.cs
@@ -102,6 +102,10 @@ namespace TShockAPI.DB
 
         public Ban GetBanByName(string name, bool casesensitive = true)
         {
+            if (!TShock.Config.EnableBanOnUsernames)
+            {
+                return null;
+            }
             try
             {
                 using (var com = database.CreateCommand())