diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/village_master/ElfHumanWizardChange2/ElfHumanWizardChange2.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/village_master/ElfHumanWizardChange2/ElfHumanWizardChange2.java
index c7cf456761..3f545e0117 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/village_master/ElfHumanWizardChange2/ElfHumanWizardChange2.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/village_master/ElfHumanWizardChange2/ElfHumanWizardChange2.java
@@ -37,7 +37,7 @@ public final class ElfHumanWizardChange2 extends AbstractNpcAI
 		30176, // Valleria
 		30694, // Scraide
 		30854, // Drikiyan
-		31279, // Gregory
+		31587, // Halaster
 	};
 	
 	// Items
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/stats/npcs/31500-31599.xml b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/stats/npcs/31500-31599.xml
index 1169bf3d22..0a162a1141 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/stats/npcs/31500-31599.xml
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/stats/npcs/31500-31599.xml
@@ -232,7 +232,7 @@
 			<height normal="16" />
 		</collision>
 	</npc>
-	<npc id="31587" level="80" type="L2Npc" name="Halaster" title="Grand Magister">
+	<npc id="31587" level="80" type="L2VillageMasterMystic" name="Halaster" title="Grand Magister">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>