diff --git a/dependencies/mcMMO.jar b/dependencies/mcMMO.jar
index dfc7e40..e747d5a 100644
Binary files a/dependencies/mcMMO.jar and b/dependencies/mcMMO.jar differ
diff --git a/src/main/java/org/monstercraft/irc/ircplugin/IRC.java b/src/main/java/org/monstercraft/irc/ircplugin/IRC.java
index aba984f..32a28c6 100644
--- a/src/main/java/org/monstercraft/irc/ircplugin/IRC.java
+++ b/src/main/java/org/monstercraft/irc/ircplugin/IRC.java
@@ -17,7 +17,7 @@
 import org.monstercraft.irc.plugin.wrappers.IRCServer;
 import org.monstercraft.support.MonsterTickets;
 
-import com.gmail.nossr50.util.Users;
+import com.gmail.nossr50.util.player.UserManager;
 
 public class IRC {
 
@@ -216,7 +216,7 @@ public static void sendMessageToGame(final IRCChannel c, final String name,
                     for (final Player p : IRC.getIRCPlugin().getServer()
                             .getOnlinePlayers()) {
                         if (p.isOp()
-                                || Users.getPlayer(p.getName())
+                                || UserManager.getPlayer(p.getName())
                                         .getAdminChatMode()) {
                             p.sendMessage(ColorUtils.formatIRCtoGame(format,
                                     message));
diff --git a/src/main/java/org/monstercraft/irc/plugin/managers/listeners/MonsterIRCListener.java b/src/main/java/org/monstercraft/irc/plugin/managers/listeners/MonsterIRCListener.java
index d6748a8..77cede5 100644
--- a/src/main/java/org/monstercraft/irc/plugin/managers/listeners/MonsterIRCListener.java
+++ b/src/main/java/org/monstercraft/irc/plugin/managers/listeners/MonsterIRCListener.java
@@ -21,7 +21,7 @@
 import org.monstercraft.irc.plugin.wrappers.IRCChannel;
 
 import com.dthielke.herochat.Herochat;
-import com.gmail.nossr50.util.Users;
+import com.gmail.nossr50.util.player.UserManager;
 
 /**
  * This class listens for chat ingame to pass to the IRC.
@@ -59,7 +59,7 @@ public void onPluginEnable(final PluginEnableEvent event) {
     @EventHandler(priority = EventPriority.NORMAL)
     public void onChat(final AsyncPlayerChatEvent event) {
         if (Bukkit.getServer().getPluginManager().getPlugin("mcMMO") != null) {
-            if (!Users.getPlayer(event.getPlayer().getName())
+            if (!UserManager.getPlayer(event.getPlayer().getName())
                     .getAdminChatMode()) {
                 if (event.isCancelled()) {
                     return;
@@ -202,7 +202,7 @@ protected static void handleMessage(final Player player,
         final StringBuffer result = new StringBuffer();
         if (c.getChatType() == ChatType.MCMMOADMINCHAT) {
             if (Bukkit.getServer().getPluginManager().getPlugin("mcMMO") != null) {
-                if (Users.getPlayer(player.getName()).getAdminChatMode()) {
+                if (UserManager.getPlayer(player.getName()).getAdminChatMode()) {
                     result.append(Variables.ircformat
                             .replace("{HCchannelColor}", "")
                             .replace("{heroChatTag}", "")
@@ -246,10 +246,10 @@ protected static void handleMessage(final Player player,
             }
         } else if (c.getChatType() == ChatType.HEROCHAT) {
             if (Bukkit.getServer().getPluginManager().getPlugin("mcMMO") != null) {
-                if (Users.getPlayer(player.getName()).getAdminChatMode()) {
+                if (UserManager.getPlayer(player.getName()).getAdminChatMode()) {
                     return;
                 }
-                if (Users.getPlayer(player.getName()).getPartyChatMode()) {
+                if (UserManager.getPlayer(player.getName()).getPartyChatMode()) {
                     return;
                 }
             }
@@ -334,10 +334,10 @@ protected static void handleMessage(final Player player,
             }
         } else if (c.getChatType() == ChatType.GLOBAL) {
             if (Bukkit.getServer().getPluginManager().getPlugin("mcMMO") != null) {
-                if (Users.getPlayer(player.getName()).getAdminChatMode()) {
+                if (UserManager.getPlayer(player.getName()).getAdminChatMode()) {
                     return;
                 }
-                if (Users.getPlayer(player.getName()).getPartyChatMode()) {
+                if (UserManager.getPlayer(player.getName()).getPartyChatMode()) {
                     return;
                 }
             }
diff --git a/src/main/java/org/monstercraft/irc/plugin/towny/TownyChatListener.java b/src/main/java/org/monstercraft/irc/plugin/towny/TownyChatListener.java
index 99acdb8..dc1d419 100644
--- a/src/main/java/org/monstercraft/irc/plugin/towny/TownyChatListener.java
+++ b/src/main/java/org/monstercraft/irc/plugin/towny/TownyChatListener.java
@@ -17,7 +17,7 @@
 import org.monstercraft.irc.plugin.util.StringUtils;
 import org.monstercraft.irc.plugin.wrappers.IRCChannel;
 
-import com.gmail.nossr50.util.Users;
+import com.gmail.nossr50.util.player.UserManager;
 import com.palmergames.bukkit.TownyChat.Chat;
 import com.palmergames.bukkit.TownyChat.channels.Channel;
 import com.palmergames.bukkit.TownyChat.channels.channelTypes;
@@ -97,10 +97,10 @@ public void handle(final IRCChannel c, final Player player,
             final String message) {
         if (c.getChatType() == ChatType.TOWNYCHAT) {
             if (Bukkit.getServer().getPluginManager().getPlugin("mcMMO") != null) {
-                if (Users.getPlayer(player.getName()).getAdminChatMode()) {
+                if (UserManager.getPlayer(player.getName()).getAdminChatMode()) {
                     return;
                 }
-                if (Users.getPlayer(player.getName()).getPartyChatMode()) {
+                if (UserManager.getPlayer(player.getName()).getPartyChatMode()) {
                     return;
                 }
             }
diff --git a/src/main/java/org/monstercraft/irc/plugin/util/StringUtils.java b/src/main/java/org/monstercraft/irc/plugin/util/StringUtils.java
index 0bc3114..8c13bde 100644
--- a/src/main/java/org/monstercraft/irc/plugin/util/StringUtils.java
+++ b/src/main/java/org/monstercraft/irc/plugin/util/StringUtils.java
@@ -21,10 +21,8 @@ public static String getPrefix(final String name) {
             if (MonsterIRC.getHookManager() != null) {
                 if (MonsterIRC.getHookManager().getChatHook() != null) {
                     if (MonsterIRC.getHookManager().getChatHook().isEnabled()) {
-                        if (MonsterIRC.getHookManager().getChatHook()
-                                .getPlayerPrefix("", name) != null) {
-                            s = MonsterIRC.getHookManager().getChatHook()
-                                    .getPlayerPrefix("", name);
+                        if (MonsterIRC.getHookManager().getChatHook().getPlayerPrefix("", name) != null) {
+                            s = MonsterIRC.getHookManager().getChatHook().getPlayerPrefix("", name);
                         }
                     }
                 }