diff --git a/HorseIsleServer/HorseIsleServer/Game/Chat/Chat.cs b/HorseIsleServer/HorseIsleServer/Game/Chat/Chat.cs
index 0474323..f7d9473 100644
--- a/HorseIsleServer/HorseIsleServer/Game/Chat/Chat.cs
+++ b/HorseIsleServer/HorseIsleServer/Game/Chat/Chat.cs
@@ -591,7 +591,7 @@ namespace HISP.Game.Chat
 
         public static string NonViolationChecks(User user, string message)
         {
-            if(ConfigReader.DoNonViolations)
+            if(!ConfigReader.DoNonViolations)
                 return null;
 
             // Check if contains password.
diff --git a/HorseIsleServer/HorseIsleServer/Resources/server.properties b/HorseIsleServer/HorseIsleServer/Resources/server.properties
index d4ca5fa..b0f1baa 100644
--- a/HorseIsleServer/HorseIsleServer/Resources/server.properties
+++ b/HorseIsleServer/HorseIsleServer/Resources/server.properties
@@ -51,7 +51,7 @@ enable_corrections=true
 # Include non-violations
 # stuff like blocking you from saying your password in chat
 # and FULL CAPS messages.
-non_violation=true
+enable_non_violation_check=true
 
 # Limits ad and global chat
 # to just a few messages every minute
diff --git a/HorseIsleServer/HorseIsleServer/Server/ConfigReader.cs b/HorseIsleServer/HorseIsleServer/Server/ConfigReader.cs
index 61f34c6..0b93e1b 100644
--- a/HorseIsleServer/HorseIsleServer/Server/ConfigReader.cs
+++ b/HorseIsleServer/HorseIsleServer/Server/ConfigReader.cs
@@ -101,7 +101,7 @@ namespace HISP.Server
                     case "enable_corrections":
                         DoCorrections = data == "true";
                         break;
-                    case "non_violation":
+                    case "enable_non_violation_check":
                         DoNonViolations = data == "true";
                         break;
                     case "enable_spam_filter":
diff --git a/HorseIsleServer/HorseIsleServer/Server/GameServer.cs b/HorseIsleServer/HorseIsleServer/Server/GameServer.cs
index a3ec993..4e5535d 100644
--- a/HorseIsleServer/HorseIsleServer/Server/GameServer.cs
+++ b/HorseIsleServer/HorseIsleServer/Server/GameServer.cs
@@ -444,7 +444,7 @@ namespace HISP.Server
                     }
                     catch (FormatException)
                     {
-                        Logger.ErrorPrint(sender.LoggedinUser.Username + " tried to trade with User ID NaN.");
+                        Logger.ErrorPrint(sender.LoggedinUser.Username + " tried to add friend with User ID NaN.");
                         break;
                     }
                     if (IsUserOnline(playerId))