diff --git a/src/bungee.yml b/src/bungee.yml
index 85d7404..3e6cc87 100644
--- a/src/bungee.yml
+++ b/src/bungee.yml
@@ -1,4 +1,4 @@
 name: VentureChat
 main: mineverse.Aust1n46.chat.bungee.MineverseChatBungee
-version: 2.21.0
+version: 2.21.1
 author: Aust1n46
\ No newline at end of file
diff --git a/src/mineverse/Aust1n46/chat/MineverseChat.java b/src/mineverse/Aust1n46/chat/MineverseChat.java
index 030200f..ed8c701 100644
--- a/src/mineverse/Aust1n46/chat/MineverseChat.java
+++ b/src/mineverse/Aust1n46/chat/MineverseChat.java
@@ -906,6 +906,7 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener {
 					out.writeUTF("Echo");
 					out.writeUTF(server);
 					out.writeUTF(p.getUUID().toString());
+					out.writeUTF(receiver);
 					out.writeUTF(sender.toString());
 					player.sendPluginMessage(this, MineverseChat.PLUGIN_MESSAGING_CHANNEL, stream.toByteArray());
 					return;
@@ -919,16 +920,13 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener {
 				}
 				if(identifier.equals("Echo")) {
 					UUID receiver = UUID.fromString(msgin.readUTF());
+					String receiverName = msgin.readUTF();
 					UUID sender = UUID.fromString(msgin.readUTF());
 					MineverseChatPlayer p = MineverseChatAPI.getOnlineMineverseChatPlayer(sender);
-					MineverseChatPlayer r = MineverseChatAPI.getMineverseChatPlayer(receiver);
-					String rName = receiver.toString();
-					if(r != null) {
-						rName = Format.FormatStringAll(r.getNickname());
-					}
 					
 					if(p.getIgnores().contains(receiver)) {
-						p.getPlayer().sendMessage(ChatColor.GOLD + "You are no longer ignoring player: " + ChatColor.RED + rName);
+						p.getPlayer().sendMessage(LocalizedMessage.IGNORE_PLAYER_OFF.toString()
+								.replace("{player}", receiverName));
 						p.removeIgnore(receiver);
 						this.synchronize(p, true);
 						return;
@@ -936,7 +934,7 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener {
 					
 					p.addIgnore(receiver);
 					p.getPlayer().sendMessage(LocalizedMessage.IGNORE_PLAYER_ON.toString()
-							.replace("{player}", rName));
+							.replace("{player}", receiverName));
 					this.synchronize(p, true);
 				}
 			}
@@ -980,9 +978,6 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener {
 						player.sendPluginMessage(this, MineverseChat.PLUGIN_MESSAGING_CHANNEL, stream.toByteArray());
 						return;
 					}
-					if(s != null) {
-						sName = Format.FormatStringAll(s.getNickname());
-					}
 					else {
 						UUID uuid = sender;
 						String name = sName;
diff --git a/src/mineverse/Aust1n46/chat/bungee/MineverseChatBungee.java b/src/mineverse/Aust1n46/chat/bungee/MineverseChatBungee.java
index 1efa883..5685456 100644
--- a/src/mineverse/Aust1n46/chat/bungee/MineverseChatBungee.java
+++ b/src/mineverse/Aust1n46/chat/bungee/MineverseChatBungee.java
@@ -333,10 +333,12 @@ public class MineverseChatBungee extends Plugin implements Listener {
 				if(identifier.equals("Echo")) {
 					String server = in.readUTF();
 					String player = in.readUTF();
+					String receiverName = in.readUTF();
 					String sender = in.readUTF();
 					out.writeUTF("Ignore");
 					out.writeUTF("Echo");
 					out.writeUTF(player);
+					out.writeUTF(receiverName);
 					out.writeUTF(sender);
 					if(getProxy().getServers().get(server).getPlayers().size() > 0) {
 						getProxy().getServers().get(server).sendData(MineverseChatBungee.PLUGIN_MESSAGING_CHANNEL, outstream.toByteArray());
diff --git a/src/mineverse/Aust1n46/chat/command/message/Ignore.java b/src/mineverse/Aust1n46/chat/command/message/Ignore.java
index cfdec64..f2cfe18 100644
--- a/src/mineverse/Aust1n46/chat/command/message/Ignore.java
+++ b/src/mineverse/Aust1n46/chat/command/message/Ignore.java
@@ -49,22 +49,8 @@ public class Ignore extends MineverseCommand {
 			}
 			return;
 		}
-		MineverseChatPlayer player = MineverseChatAPI.getMineverseChatPlayer(args[0]);
-
-		if(player == null) {
-			mcp.getPlayer().sendMessage(LocalizedMessage.PLAYER_OFFLINE.toString()
-					.replace("{args}", args[0]));
-			return;
-		}
-		if(mcp.getIgnores().contains(player.getUUID())) {
-			mcp.getPlayer().sendMessage(LocalizedMessage.IGNORE_PLAYER_OFF.toString()
-					.replace("{player}", player.getName()));
-			mcp.removeIgnore(player.getUUID());
-			plugin.synchronize(mcp, true);
-			return;
-		}
-		if(mcp.getName().equalsIgnoreCase(player.getName())) {
-			mcp.getPlayer().sendMessage(LocalizedMessage.IGNORE_YOURSELF.toString());
+		if(mcp.getName().equalsIgnoreCase(args[0])) {
+			mcp.getPlayer().sendMessage(LocalizedMessage.IGNORE_YOURSELF.toString());
 			return;
 		}
 		if(plugin.getConfig().getBoolean("bungeecordmessaging", true)) {
@@ -81,19 +67,22 @@ public class Ignore extends MineverseCommand {
 			catch(Exception e) {
 				e.printStackTrace();
 			}
-			return;
-		}		
-		if(!player.isOnline()) {
+			return;
+		}	
+		
+		MineverseChatPlayer player = MineverseChatAPI.getMineverseChatPlayer(args[0]);
+		if(player == null || !player.isOnline()) {
 			mcp.getPlayer().sendMessage(LocalizedMessage.PLAYER_OFFLINE.toString()
-					.replace("{args}", player.getName()));
+					.replace("{args}", args[0]));
 			return;
 		}
 		if(mcp.getIgnores().contains(player.getUUID())) {
-			mcp.getPlayer().sendMessage(ChatColor.GOLD + "You are no longer ignoring player: " + ChatColor.RED + player.getName());
+			mcp.getPlayer().sendMessage(LocalizedMessage.IGNORE_PLAYER_OFF.toString()
+					.replace("{player}", player.getName()));
 			mcp.removeIgnore(player.getUUID());
 			plugin.synchronize(mcp, true);
 			return;
-		}		
+		}
 		if(player.getPlayer().hasPermission("venturechat.ignore.bypass")) {
 			mcp.getPlayer().sendMessage(LocalizedMessage.IGNORE_PLAYER_CANT.toString()
 					.replace("{player}", player.getName()));
diff --git a/src/plugin.yml b/src/plugin.yml
index acaf271..725a6bd 100644
--- a/src/plugin.yml
+++ b/src/plugin.yml
@@ -1,5 +1,5 @@
 name: VentureChat
-version: 2.21.0
+version: 2.21.1
 api-version: 1.13
 main: mineverse.Aust1n46.chat.MineverseChat
 depend: [Vault, ProtocolLib, PlaceholderAPI]