diff --git a/src/main/java/kamkeel/npcs/network/packets/request/playerdata/PlayerDataRemovePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/playerdata/PlayerDataRemovePacket.java
index fbe8c7991..59c07f110 100644
--- a/src/main/java/kamkeel/npcs/network/packets/request/playerdata/PlayerDataRemovePacket.java
+++ b/src/main/java/kamkeel/npcs/network/packets/request/playerdata/PlayerDataRemovePacket.java
@@ -24,22 +24,12 @@ public final class PlayerDataRemovePacket extends AbstractPacket {
     private EnumPlayerData playerData;
     private String name;
 
-    private int type;
-    private String selected;
-
     public PlayerDataRemovePacket() {
     }
 
-    public PlayerDataRemovePacket(EnumPlayerData playerData, String name, String selected) {
+    public PlayerDataRemovePacket(EnumPlayerData playerData, String name) {
         this.playerData = playerData;
         this.name = name;
-        this.selected = selected;
-    }
-
-    public PlayerDataRemovePacket(EnumPlayerData playerData, String name, int selectedType) {
-        this.playerData = playerData;
-        this.name = name;
-        this.type = selectedType;
     }
 
     @Override
@@ -62,11 +52,6 @@ public final class PlayerDataRemovePacket extends AbstractPacket {
     public void sendData(ByteBuf out) throws IOException {
         out.writeInt(playerData.ordinal());
         ByteBufUtils.writeString(out, this.name);
-        if (playerData == EnumPlayerData.Players) {
-            ByteBufUtils.writeString(out, this.selected);
-        } else {
-            out.writeInt(this.type);
-        }
     }
 
     @Override
diff --git a/src/main/java/noppes/npcs/NoppesUtilServer.java b/src/main/java/noppes/npcs/NoppesUtilServer.java
index 98c01d373..f538d4afd 100644
--- a/src/main/java/noppes/npcs/NoppesUtilServer.java
+++ b/src/main/java/noppes/npcs/NoppesUtilServer.java
@@ -544,7 +544,11 @@ public class NoppesUtilServer {
                 PlayerDataController.Instance.nameUUIDs.remove(name);
                 PlayerDataController.Instance.savePlayerDataMap();
 
+                int currentSlot = playerdata.profileSlot;
+
                 playerdata.setNBT(new NBTTagCompound());
+                playerdata.profileSlot = currentSlot;
+
                 sendPlayerData(type, player, name);
                 playerdata.save();
                 return;
diff --git a/src/main/java/noppes/npcs/client/gui/global/GuiNpcManagePlayerData.java b/src/main/java/noppes/npcs/client/gui/global/GuiNpcManagePlayerData.java
index e66019bbd..a30838249 100644
--- a/src/main/java/noppes/npcs/client/gui/global/GuiNpcManagePlayerData.java
+++ b/src/main/java/noppes/npcs/client/gui/global/GuiNpcManagePlayerData.java
@@ -115,10 +115,12 @@ public class GuiNpcManagePlayerData extends GuiNPCInterface2 implements GuiYesNo
     public void confirmClicked(boolean confirm, int id) {
         if (confirm) {
             if (id == 0) {
-                PacketClient.sendClient(new PlayerDataRemovePacket(EnumPlayerData.Players, selectedPlayer, null));
-                playerData.remove(selectedPlayer);
-                selectedPlayer = null;
-                playerScroll.setList(getSearchList());
+                if(selectedPlayer != null && !selectedPlayer.isEmpty()){
+                    PacketClient.sendClient(new PlayerDataRemovePacket(EnumPlayerData.Players, selectedPlayer));
+                    playerData.remove(selectedPlayer);
+                    selectedPlayer = null;
+                    playerScroll.setList(getSearchList());
+                }
             }
             if (id == 1) {
                 PacketClient.sendClient(new PlayerDataMapRegenPacket());