diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java
index 04c17d4052..7636cb381c 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java
@@ -26,14 +26,17 @@ import org.l2jmobius.gameserver.enums.CategoryType;
 import org.l2jmobius.gameserver.enums.ClassId;
 import org.l2jmobius.gameserver.enums.Race;
 import org.l2jmobius.gameserver.enums.SubclassInfoType;
+import org.l2jmobius.gameserver.model.Shortcut;
 import org.l2jmobius.gameserver.model.SkillLearn;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.olympiad.Olympiad;
 import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.network.serverpackets.ExSubjobInfo;
 import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoInvenWeight;
 import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
+import org.l2jmobius.gameserver.taskmanager.AutoUseTaskManager;
 
 import ai.AbstractNpcAI;
 
@@ -141,6 +144,47 @@ public class Hardin extends AbstractNpcAI
 			{
 				player.getAppearance().setFemale();
 			}
+			// Stop Auto Use Skills
+			for (Shortcut shortcut : player.getAllShortCuts())
+			{
+				if (!shortcut.isAutoUse())
+				{
+					continue;
+				}
+				
+				player.removeAutoShortcut(shortcut.getSlot(), shortcut.getPage());
+				
+				if (player.getAutoUseSettings().isAutoSkill(shortcut.getId()))
+				{
+					final Skill knownSkill = player.getKnownSkill(shortcut.getId());
+					if (knownSkill != null)
+					{
+						if (knownSkill.isBad())
+						{
+							AutoUseTaskManager.getInstance().removeAutoSkill(player, shortcut.getId());
+						}
+						else
+						{
+							AutoUseTaskManager.getInstance().removeAutoBuff(player, shortcut.getId());
+						}
+					}
+				}
+				else
+				{
+					final Item knownItem = player.getInventory().getItemByObjectId(shortcut.getId());
+					if (knownItem != null)
+					{
+						if (knownItem.isPotion())
+						{
+							AutoUseTaskManager.getInstance().removeAutoPotionItem(player, knownItem.getId());
+						}
+						else
+						{
+							AutoUseTaskManager.getInstance().removeAutoSupplyItem(player, knownItem.getId());
+						}
+					}
+				}
+			}
 			// Change class
 			player.setClassId(newClass.getId());
 			if (player.isDualClassActive())
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java
index 04c17d4052..7636cb381c 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java
@@ -26,14 +26,17 @@ import org.l2jmobius.gameserver.enums.CategoryType;
 import org.l2jmobius.gameserver.enums.ClassId;
 import org.l2jmobius.gameserver.enums.Race;
 import org.l2jmobius.gameserver.enums.SubclassInfoType;
+import org.l2jmobius.gameserver.model.Shortcut;
 import org.l2jmobius.gameserver.model.SkillLearn;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.olympiad.Olympiad;
 import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.network.serverpackets.ExSubjobInfo;
 import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoInvenWeight;
 import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
+import org.l2jmobius.gameserver.taskmanager.AutoUseTaskManager;
 
 import ai.AbstractNpcAI;
 
@@ -141,6 +144,47 @@ public class Hardin extends AbstractNpcAI
 			{
 				player.getAppearance().setFemale();
 			}
+			// Stop Auto Use Skills
+			for (Shortcut shortcut : player.getAllShortCuts())
+			{
+				if (!shortcut.isAutoUse())
+				{
+					continue;
+				}
+				
+				player.removeAutoShortcut(shortcut.getSlot(), shortcut.getPage());
+				
+				if (player.getAutoUseSettings().isAutoSkill(shortcut.getId()))
+				{
+					final Skill knownSkill = player.getKnownSkill(shortcut.getId());
+					if (knownSkill != null)
+					{
+						if (knownSkill.isBad())
+						{
+							AutoUseTaskManager.getInstance().removeAutoSkill(player, shortcut.getId());
+						}
+						else
+						{
+							AutoUseTaskManager.getInstance().removeAutoBuff(player, shortcut.getId());
+						}
+					}
+				}
+				else
+				{
+					final Item knownItem = player.getInventory().getItemByObjectId(shortcut.getId());
+					if (knownItem != null)
+					{
+						if (knownItem.isPotion())
+						{
+							AutoUseTaskManager.getInstance().removeAutoPotionItem(player, knownItem.getId());
+						}
+						else
+						{
+							AutoUseTaskManager.getInstance().removeAutoSupplyItem(player, knownItem.getId());
+						}
+					}
+				}
+			}
 			// Change class
 			player.setClassId(newClass.getId());
 			if (player.isDualClassActive())
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java
index 04c17d4052..7636cb381c 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java
@@ -26,14 +26,17 @@ import org.l2jmobius.gameserver.enums.CategoryType;
 import org.l2jmobius.gameserver.enums.ClassId;
 import org.l2jmobius.gameserver.enums.Race;
 import org.l2jmobius.gameserver.enums.SubclassInfoType;
+import org.l2jmobius.gameserver.model.Shortcut;
 import org.l2jmobius.gameserver.model.SkillLearn;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.olympiad.Olympiad;
 import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.network.serverpackets.ExSubjobInfo;
 import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoInvenWeight;
 import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
+import org.l2jmobius.gameserver.taskmanager.AutoUseTaskManager;
 
 import ai.AbstractNpcAI;
 
@@ -141,6 +144,47 @@ public class Hardin extends AbstractNpcAI
 			{
 				player.getAppearance().setFemale();
 			}
+			// Stop Auto Use Skills
+			for (Shortcut shortcut : player.getAllShortCuts())
+			{
+				if (!shortcut.isAutoUse())
+				{
+					continue;
+				}
+				
+				player.removeAutoShortcut(shortcut.getSlot(), shortcut.getPage());
+				
+				if (player.getAutoUseSettings().isAutoSkill(shortcut.getId()))
+				{
+					final Skill knownSkill = player.getKnownSkill(shortcut.getId());
+					if (knownSkill != null)
+					{
+						if (knownSkill.isBad())
+						{
+							AutoUseTaskManager.getInstance().removeAutoSkill(player, shortcut.getId());
+						}
+						else
+						{
+							AutoUseTaskManager.getInstance().removeAutoBuff(player, shortcut.getId());
+						}
+					}
+				}
+				else
+				{
+					final Item knownItem = player.getInventory().getItemByObjectId(shortcut.getId());
+					if (knownItem != null)
+					{
+						if (knownItem.isPotion())
+						{
+							AutoUseTaskManager.getInstance().removeAutoPotionItem(player, knownItem.getId());
+						}
+						else
+						{
+							AutoUseTaskManager.getInstance().removeAutoSupplyItem(player, knownItem.getId());
+						}
+					}
+				}
+			}
 			// Change class
 			player.setClassId(newClass.getId());
 			if (player.isDualClassActive())
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/RedLibra/Eraton/Eraton.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/RedLibra/Eraton/Eraton.java
index 0717e168d3..0fa260d603 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/RedLibra/Eraton/Eraton.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/events/RedLibra/Eraton/Eraton.java
@@ -25,6 +25,7 @@ import org.l2jmobius.gameserver.data.xml.SkillTreeData;
 import org.l2jmobius.gameserver.enums.ClassId;
 import org.l2jmobius.gameserver.enums.Race;
 import org.l2jmobius.gameserver.enums.SubclassInfoType;
+import org.l2jmobius.gameserver.model.Shortcut;
 import org.l2jmobius.gameserver.model.SkillLearn;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
@@ -35,12 +36,14 @@ import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent;
 import org.l2jmobius.gameserver.model.events.annotations.RegisterType;
 import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcMenuSelect;
 import org.l2jmobius.gameserver.model.holders.ItemHolder;
+import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.ExSubjobInfo;
 import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoInvenWeight;
 import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
 import org.l2jmobius.gameserver.network.serverpackets.SocialAction;
+import org.l2jmobius.gameserver.taskmanager.AutoUseTaskManager;
 
 import ai.AbstractNpcAI;
 
@@ -290,6 +293,47 @@ public class Eraton extends AbstractNpcAI
 				}
 				takeItem(player, STONE_OF_DESTINY);
 				takeItem(player, getCloakItemId(player));
+				// Stop Auto Use Skills
+				for (Shortcut shortcut : player.getAllShortCuts())
+				{
+					if (!shortcut.isAutoUse())
+					{
+						continue;
+					}
+					
+					player.removeAutoShortcut(shortcut.getSlot(), shortcut.getPage());
+					
+					if (player.getAutoUseSettings().isAutoSkill(shortcut.getId()))
+					{
+						final Skill knownSkill = player.getKnownSkill(shortcut.getId());
+						if (knownSkill != null)
+						{
+							if (knownSkill.isBad())
+							{
+								AutoUseTaskManager.getInstance().removeAutoSkill(player, shortcut.getId());
+							}
+							else
+							{
+								AutoUseTaskManager.getInstance().removeAutoBuff(player, shortcut.getId());
+							}
+						}
+					}
+					else
+					{
+						final Item knownItem = player.getInventory().getItemByObjectId(shortcut.getId());
+						if (knownItem != null)
+						{
+							if (knownItem.isPotion())
+							{
+								AutoUseTaskManager.getInstance().removeAutoPotionItem(player, knownItem.getId());
+							}
+							else
+							{
+								AutoUseTaskManager.getInstance().removeAutoSupplyItem(player, knownItem.getId());
+							}
+						}
+					}
+				}
 				player.abortCast();
 				player.stopAllEffectsExceptThoseThatLastThroughDeath();
 				player.stopAllEffects();
diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java
index 04c17d4052..7636cb381c 100644
--- a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java
+++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java
@@ -26,14 +26,17 @@ import org.l2jmobius.gameserver.enums.CategoryType;
 import org.l2jmobius.gameserver.enums.ClassId;
 import org.l2jmobius.gameserver.enums.Race;
 import org.l2jmobius.gameserver.enums.SubclassInfoType;
+import org.l2jmobius.gameserver.model.Shortcut;
 import org.l2jmobius.gameserver.model.SkillLearn;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.olympiad.Olympiad;
 import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.network.serverpackets.ExSubjobInfo;
 import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoInvenWeight;
 import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
+import org.l2jmobius.gameserver.taskmanager.AutoUseTaskManager;
 
 import ai.AbstractNpcAI;
 
@@ -141,6 +144,47 @@ public class Hardin extends AbstractNpcAI
 			{
 				player.getAppearance().setFemale();
 			}
+			// Stop Auto Use Skills
+			for (Shortcut shortcut : player.getAllShortCuts())
+			{
+				if (!shortcut.isAutoUse())
+				{
+					continue;
+				}
+				
+				player.removeAutoShortcut(shortcut.getSlot(), shortcut.getPage());
+				
+				if (player.getAutoUseSettings().isAutoSkill(shortcut.getId()))
+				{
+					final Skill knownSkill = player.getKnownSkill(shortcut.getId());
+					if (knownSkill != null)
+					{
+						if (knownSkill.isBad())
+						{
+							AutoUseTaskManager.getInstance().removeAutoSkill(player, shortcut.getId());
+						}
+						else
+						{
+							AutoUseTaskManager.getInstance().removeAutoBuff(player, shortcut.getId());
+						}
+					}
+				}
+				else
+				{
+					final Item knownItem = player.getInventory().getItemByObjectId(shortcut.getId());
+					if (knownItem != null)
+					{
+						if (knownItem.isPotion())
+						{
+							AutoUseTaskManager.getInstance().removeAutoPotionItem(player, knownItem.getId());
+						}
+						else
+						{
+							AutoUseTaskManager.getInstance().removeAutoSupplyItem(player, knownItem.getId());
+						}
+					}
+				}
+			}
 			// Change class
 			player.setClassId(newClass.getId());
 			if (player.isDualClassActive())
diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/events/RedLibra/Eraton/Eraton.java b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/events/RedLibra/Eraton/Eraton.java
index d450e58221..44199a2f82 100644
--- a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/events/RedLibra/Eraton/Eraton.java
+++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/events/RedLibra/Eraton/Eraton.java
@@ -25,6 +25,7 @@ import org.l2jmobius.gameserver.data.xml.SkillTreeData;
 import org.l2jmobius.gameserver.enums.ClassId;
 import org.l2jmobius.gameserver.enums.Race;
 import org.l2jmobius.gameserver.enums.SubclassInfoType;
+import org.l2jmobius.gameserver.model.Shortcut;
 import org.l2jmobius.gameserver.model.SkillLearn;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
@@ -35,12 +36,14 @@ import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent;
 import org.l2jmobius.gameserver.model.events.annotations.RegisterType;
 import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcMenuSelect;
 import org.l2jmobius.gameserver.model.holders.ItemHolder;
+import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.ExSubjobInfo;
 import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoInvenWeight;
 import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
 import org.l2jmobius.gameserver.network.serverpackets.SocialAction;
+import org.l2jmobius.gameserver.taskmanager.AutoUseTaskManager;
 
 import ai.AbstractNpcAI;
 
@@ -295,6 +298,47 @@ public class Eraton extends AbstractNpcAI
 				}
 				takeItem(player, STONE_OF_DESTINY);
 				takeItem(player, getCloakItemId(player));
+				// Stop Auto Use Skills
+				for (Shortcut shortcut : player.getAllShortCuts())
+				{
+					if (!shortcut.isAutoUse())
+					{
+						continue;
+					}
+					
+					player.removeAutoShortcut(shortcut.getSlot(), shortcut.getPage());
+					
+					if (player.getAutoUseSettings().isAutoSkill(shortcut.getId()))
+					{
+						final Skill knownSkill = player.getKnownSkill(shortcut.getId());
+						if (knownSkill != null)
+						{
+							if (knownSkill.isBad())
+							{
+								AutoUseTaskManager.getInstance().removeAutoSkill(player, shortcut.getId());
+							}
+							else
+							{
+								AutoUseTaskManager.getInstance().removeAutoBuff(player, shortcut.getId());
+							}
+						}
+					}
+					else
+					{
+						final Item knownItem = player.getInventory().getItemByObjectId(shortcut.getId());
+						if (knownItem != null)
+						{
+							if (knownItem.isPotion())
+							{
+								AutoUseTaskManager.getInstance().removeAutoPotionItem(player, knownItem.getId());
+							}
+							else
+							{
+								AutoUseTaskManager.getInstance().removeAutoSupplyItem(player, knownItem.getId());
+							}
+						}
+					}
+				}
 				player.abortCast();
 				player.stopAllEffectsExceptThoseThatLastThroughDeath();
 				player.stopAllEffects();
diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java
index 04c17d4052..7636cb381c 100644
--- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java
+++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/ai/areas/TalkingIsland/Hardin/Hardin.java
@@ -26,14 +26,17 @@ import org.l2jmobius.gameserver.enums.CategoryType;
 import org.l2jmobius.gameserver.enums.ClassId;
 import org.l2jmobius.gameserver.enums.Race;
 import org.l2jmobius.gameserver.enums.SubclassInfoType;
+import org.l2jmobius.gameserver.model.Shortcut;
 import org.l2jmobius.gameserver.model.SkillLearn;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.olympiad.Olympiad;
 import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.network.serverpackets.ExSubjobInfo;
 import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoInvenWeight;
 import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
+import org.l2jmobius.gameserver.taskmanager.AutoUseTaskManager;
 
 import ai.AbstractNpcAI;
 
@@ -141,6 +144,47 @@ public class Hardin extends AbstractNpcAI
 			{
 				player.getAppearance().setFemale();
 			}
+			// Stop Auto Use Skills
+			for (Shortcut shortcut : player.getAllShortCuts())
+			{
+				if (!shortcut.isAutoUse())
+				{
+					continue;
+				}
+				
+				player.removeAutoShortcut(shortcut.getSlot(), shortcut.getPage());
+				
+				if (player.getAutoUseSettings().isAutoSkill(shortcut.getId()))
+				{
+					final Skill knownSkill = player.getKnownSkill(shortcut.getId());
+					if (knownSkill != null)
+					{
+						if (knownSkill.isBad())
+						{
+							AutoUseTaskManager.getInstance().removeAutoSkill(player, shortcut.getId());
+						}
+						else
+						{
+							AutoUseTaskManager.getInstance().removeAutoBuff(player, shortcut.getId());
+						}
+					}
+				}
+				else
+				{
+					final Item knownItem = player.getInventory().getItemByObjectId(shortcut.getId());
+					if (knownItem != null)
+					{
+						if (knownItem.isPotion())
+						{
+							AutoUseTaskManager.getInstance().removeAutoPotionItem(player, knownItem.getId());
+						}
+						else
+						{
+							AutoUseTaskManager.getInstance().removeAutoSupplyItem(player, knownItem.getId());
+						}
+					}
+				}
+			}
 			// Change class
 			player.setClassId(newClass.getId());
 			if (player.isDualClassActive())
diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/events/RedLibra/Eraton/Eraton.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/events/RedLibra/Eraton/Eraton.java
index d450e58221..44199a2f82 100644
--- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/events/RedLibra/Eraton/Eraton.java
+++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/events/RedLibra/Eraton/Eraton.java
@@ -25,6 +25,7 @@ import org.l2jmobius.gameserver.data.xml.SkillTreeData;
 import org.l2jmobius.gameserver.enums.ClassId;
 import org.l2jmobius.gameserver.enums.Race;
 import org.l2jmobius.gameserver.enums.SubclassInfoType;
+import org.l2jmobius.gameserver.model.Shortcut;
 import org.l2jmobius.gameserver.model.SkillLearn;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
@@ -35,12 +36,14 @@ import org.l2jmobius.gameserver.model.events.annotations.RegisterEvent;
 import org.l2jmobius.gameserver.model.events.annotations.RegisterType;
 import org.l2jmobius.gameserver.model.events.impl.creature.npc.OnNpcMenuSelect;
 import org.l2jmobius.gameserver.model.holders.ItemHolder;
+import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.ExSubjobInfo;
 import org.l2jmobius.gameserver.network.serverpackets.ExUserInfoInvenWeight;
 import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
 import org.l2jmobius.gameserver.network.serverpackets.SocialAction;
+import org.l2jmobius.gameserver.taskmanager.AutoUseTaskManager;
 
 import ai.AbstractNpcAI;
 
@@ -295,6 +298,47 @@ public class Eraton extends AbstractNpcAI
 				}
 				takeItem(player, STONE_OF_DESTINY);
 				takeItem(player, getCloakItemId(player));
+				// Stop Auto Use Skills
+				for (Shortcut shortcut : player.getAllShortCuts())
+				{
+					if (!shortcut.isAutoUse())
+					{
+						continue;
+					}
+					
+					player.removeAutoShortcut(shortcut.getSlot(), shortcut.getPage());
+					
+					if (player.getAutoUseSettings().isAutoSkill(shortcut.getId()))
+					{
+						final Skill knownSkill = player.getKnownSkill(shortcut.getId());
+						if (knownSkill != null)
+						{
+							if (knownSkill.isBad())
+							{
+								AutoUseTaskManager.getInstance().removeAutoSkill(player, shortcut.getId());
+							}
+							else
+							{
+								AutoUseTaskManager.getInstance().removeAutoBuff(player, shortcut.getId());
+							}
+						}
+					}
+					else
+					{
+						final Item knownItem = player.getInventory().getItemByObjectId(shortcut.getId());
+						if (knownItem != null)
+						{
+							if (knownItem.isPotion())
+							{
+								AutoUseTaskManager.getInstance().removeAutoPotionItem(player, knownItem.getId());
+							}
+							else
+							{
+								AutoUseTaskManager.getInstance().removeAutoSupplyItem(player, knownItem.getId());
+							}
+						}
+					}
+				}
 				player.abortCast();
 				player.stopAllEffectsExceptThoseThatLastThroughDeath();
 				player.stopAllEffects();