diff --git a/trunk/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java b/trunk/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java
index 84d9026f7f..e6311abe68 100644
--- a/trunk/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java
+++ b/trunk/dist/game/data/scripts/ai/areas/TalkingIsland/AwakeningMaster/AwakeningMaster.java
@@ -181,9 +181,17 @@ public final class AwakeningMaster extends AbstractNpcAI
 						}
 					}
 					
-					for (ClassId newClass : player.getClassId().getNextClassIds())
+					if (player.getClassId() == ClassId.FEMALE_SOUL_HOUND)
 					{
-						player.sendPacket(new ExChangeToAwakenedClass(newClass.getId()));
+						// Fix for Female Soulhounds
+						player.sendPacket(new ExChangeToAwakenedClass(ClassId.FEOH_SOUL_HOUND.getId()));
+					}
+					else
+					{
+						for (ClassId newClass : player.getClassId().getNextClassIds())
+						{
+							player.sendPacket(new ExChangeToAwakenedClass(newClass.getId()));
+						}
 					}
 				}
 				else
diff --git a/trunk/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java b/trunk/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
index c74b6642bf..1a51003757 100644
--- a/trunk/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
+++ b/trunk/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
@@ -740,7 +740,15 @@ public final class ClassMaster extends AbstractNpcAI implements IGameXmlReader
 	
 	private boolean changeToNextClass(L2PcInstance player)
 	{
-		final ClassId newClass = Arrays.stream(ClassId.values()).filter(cid -> player.getClassId() == cid.getParent()).findAny().orElse(null);
+		ClassId newClass = null;
+		if (player.getClassId() == ClassId.FEMALE_SOUL_HOUND)
+		{
+			newClass = ClassId.FEOH_SOUL_HOUND; // Fix for Female Soulhounds
+		}
+		else
+		{
+			newClass = Arrays.stream(ClassId.values()).filter(cid -> player.getClassId() == cid.getParent()).findAny().orElse(null);
+		}
 		
 		if (newClass == null)
 		{