diff --git a/Plugins/Mineplex.Core/src/mineplex/core/disguise/PlayerDisguiseManager.java b/Plugins/Mineplex.Core/src/mineplex/core/disguise/PlayerDisguiseManager.java
index d7a900895..82e27bb5f 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/disguise/PlayerDisguiseManager.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/disguise/PlayerDisguiseManager.java
@@ -10,6 +10,7 @@ import mineplex.serverdata.redis.RedisDataRepository;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.event.EventHandler;
+import org.bukkit.event.player.AsyncPlayerChatEvent;
 import org.bukkit.event.player.PlayerCommandPreprocessEvent;
 import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/command/DisguiseCommand.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/command/DisguiseCommand.java
index 8e164a323..d6a509845 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/command/DisguiseCommand.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/command/DisguiseCommand.java
@@ -19,6 +19,7 @@ import mineplex.core.disguise.disguises.DisguisePlayer;
 import mineplex.core.gadget.event.GadgetEnableEvent;
 import mineplex.core.gadget.types.GadgetType;
 import mineplex.core.punish.Category;
+import mineplex.core.punish.PunishClient;
 import mineplex.core.punish.Punishment;
 import mineplex.core.treasure.event.TreasureStartEvent;
 import mineplex.core.updater.UpdateType;
@@ -192,6 +193,7 @@ public class DisguiseCommand extends CommandBase<ArcadeManager> implements Liste
 					{
 						other = new CoreClient(args[0]);
 						Plugin.GetClients().LoadClient(other, uuid, caller.getAddress().getAddress().getAddress().toString());
+						System.out.println(other.getAccountId());
 						otherRank = other.GetRank();
 					} catch(NullPointerException exception)
 					{
@@ -205,19 +207,10 @@ public class DisguiseCommand extends CommandBase<ArcadeManager> implements Liste
 					boolean canDisguise = true;
 					if(other != null)
 					{
-						NautHashMap<Category, List<Punishment>> punishments = Plugin.getPunishments().GetClient(args[0]).GetPunishments();
-						for(Category punishmentCategorys : punishments.keySet())
+						PunishClient pclient = Plugin.getPunishments().GetClient(args[0]);
+						if(pclient.IsBanned() || pclient.IsMuted())
 						{
-							for(Punishment punishment : punishments.get(punishmentCategorys))
-							{
-								if(punishment.GetActive())
-								{
-									canDisguise = false;
-									break;
-								}
-							}
-							if(!canDisguise)
-								break;
+							canDisguise = false;
 						}
 					}
 					if(!canDisguise)