diff --git a/src/main/java/com/gmail/nossr50/commands/McMMOCommand.java b/src/main/java/com/gmail/nossr50/commands/McMMOCommand.java
index 0ddeee4c4..466fc0cb6 100644
--- a/src/main/java/com/gmail/nossr50/commands/McMMOCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/McMMOCommand.java
@@ -27,7 +27,7 @@ public class McMMOCommand implements CommandExecutor {
                 String description = pluginRef.getLocaleManager().getString("mcMMO.Description");
                 String[] mcSplit = description.split(",");
                 sender.sendMessage(mcSplit);
-                sender.sendMessage(LocaleLoader.getString("mcMMO.Description.FormerDevs"));
+                sender.sendMessage(pluginRef.getLocaleManager().getString("mcMMO.Description.FormerDevs"));
 
                 if (pluginRef.getConfigManager().getConfigAds().isShowDonationInfo()) {
                     sender.sendMessage(pluginRef.getLocaleManager().getString("MOTD.Donate"));
diff --git a/src/main/java/com/gmail/nossr50/commands/chat/ChatCommand.java b/src/main/java/com/gmail/nossr50/commands/chat/ChatCommand.java
index f18d27b2f..2b2a5f079 100644
--- a/src/main/java/com/gmail/nossr50/commands/chat/ChatCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/chat/ChatCommand.java
@@ -121,7 +121,7 @@ public abstract class ChatCommand implements TabExecutor {
         }
 
         mcMMOPlayer.enableChat(chatMode);
-        sender.sendMessage(chatMode.getEnabledMessage());
+        sender.sendMessage(getChatModeEnabledMessage(chatMode, true));
     }
 
     private void disableChatMode(McMMOPlayer mcMMOPlayer, CommandSender sender) {
@@ -131,6 +131,29 @@ public abstract class ChatCommand implements TabExecutor {
         }
 
         mcMMOPlayer.disableChat(chatMode);
-        sender.sendMessage(chatMode.getDisabledMessage());
+        sender.sendMessage(getChatModeEnabledMessage(chatMode, false));
+    }
+
+    private String getChatModeEnabledMessage(ChatMode chatMode, boolean enabled) {
+        switch(chatMode) {
+            case ADMIN:
+                return getAdminMessage(enabled);
+            default:
+                return getPartyMessage(enabled);
+        }
+    }
+
+    private String getAdminMessage(boolean enabled) {
+        if(enabled)
+            return pluginRef.getLocaleManager().getString("Commands.AdminChat.On");
+        else
+            return pluginRef.getLocaleManager().getString("Commands.AdminChat.Off");
+    }
+
+    private String getPartyMessage(boolean enabled) {
+        if(enabled)
+            return pluginRef.getLocaleManager().getString("Commands.Party.Chat.On");
+        else
+            return pluginRef.getLocaleManager().getString("Commands.Party.Chat.Off");
     }
 }
diff --git a/src/main/java/com/gmail/nossr50/datatypes/chat/ChatMode.java b/src/main/java/com/gmail/nossr50/datatypes/chat/ChatMode.java
index 9170b18c6..825c6f387 100644
--- a/src/main/java/com/gmail/nossr50/datatypes/chat/ChatMode.java
+++ b/src/main/java/com/gmail/nossr50/datatypes/chat/ChatMode.java
@@ -1,22 +1,6 @@
 package com.gmail.nossr50.datatypes.chat;
 
 public enum ChatMode {
-    ADMIN(pluginRef.getLocaleManager().getString("Commands.AdminChat.On"), pluginRef.getLocaleManager().getString("Commands.AdminChat.Off")),
-    PARTY(pluginRef.getLocaleManager().getString("Commands.Party.Chat.On"), pluginRef.getLocaleManager().getString("Commands.Party.Chat.Off"));
-
-    private String enabledMessage;
-    private String disabledMessage;
-
-    ChatMode(String enabledMessage, String disabledMessage) {
-        this.enabledMessage = enabledMessage;
-        this.disabledMessage = disabledMessage;
-    }
-
-    public String getEnabledMessage() {
-        return enabledMessage;
-    }
-
-    public String getDisabledMessage() {
-        return disabledMessage;
-    }
+    ADMIN,
+    PARTY;
 }