diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
index 85c3d5df12..a34d633757 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
@@ -336,12 +336,7 @@ public final class ClassMaster extends AbstractNpcAI implements IGameXmlReader
 					return null;
 				}
 				
-				int classId = Integer.parseInt(st.nextToken());
-				if (classId == ClassId.FEMALE_SOUL_HOUND.getId())
-				{
-					classId = ClassId.FEOH_SOUL_HOUND.getId(); // Fix for Female Soulhounds
-				}
-				
+				final int classId = Integer.parseInt(st.nextToken());
 				boolean canChange = false;
 				if ((player.isInCategory(CategoryType.SECOND_CLASS_GROUP) || player.isInCategory(CategoryType.FIRST_CLASS_GROUP)) && (player.getLevel() >= 40)) // In retail you can skip first occupation
 				{
@@ -734,11 +729,13 @@ public final class ClassMaster extends AbstractNpcAI implements IGameXmlReader
 						htmltext = "test_server_helper020a.html";
 						break;
 					}
+					case MALE_SOLDIER:
 					case TROOPER:
 					{
 						htmltext = "test_server_helper020c.html";
 						break;
 					}
+					case FEMALE_SOLDIER:
 					case WARDER:
 					{
 						htmltext = "test_server_helper020d.html";
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
index d456e69529..4d18eb5a3f 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
@@ -336,12 +336,7 @@ public final class ClassMaster extends AbstractNpcAI implements IGameXmlReader
 					return null;
 				}
 				
-				int classId = Integer.parseInt(st.nextToken());
-				if (classId == ClassId.FEMALE_SOUL_HOUND.getId())
-				{
-					classId = ClassId.FEOH_SOUL_HOUND.getId(); // Fix for Female Soulhounds
-				}
-				
+				final int classId = Integer.parseInt(st.nextToken());
 				boolean canChange = false;
 				if ((player.isInCategory(CategoryType.SECOND_CLASS_GROUP) || player.isInCategory(CategoryType.FIRST_CLASS_GROUP)) && (player.getLevel() >= 40)) // In retail you can skip first occupation
 				{
@@ -734,11 +729,13 @@ public final class ClassMaster extends AbstractNpcAI implements IGameXmlReader
 						htmltext = "test_server_helper020a.html";
 						break;
 					}
+					case MALE_SOLDIER:
 					case TROOPER:
 					{
 						htmltext = "test_server_helper020c.html";
 						break;
 					}
+					case FEMALE_SOLDIER:
 					case WARDER:
 					{
 						htmltext = "test_server_helper020d.html";
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
index 5a710bf4cb..e9feba2163 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
@@ -336,12 +336,7 @@ public final class ClassMaster extends AbstractNpcAI implements IGameXmlReader
 					return null;
 				}
 				
-				int classId = Integer.parseInt(st.nextToken());
-				if (classId == ClassId.FEMALE_SOUL_HOUND.getId())
-				{
-					classId = ClassId.FEOH_SOUL_HOUND.getId(); // Fix for Female Soulhounds
-				}
-				
+				final int classId = Integer.parseInt(st.nextToken());
 				boolean canChange = false;
 				if ((player.isInCategory(CategoryType.SECOND_CLASS_GROUP) || player.isInCategory(CategoryType.FIRST_CLASS_GROUP)) && (player.getLevel() >= 40)) // In retail you can skip first occupation
 				{
@@ -734,11 +729,13 @@ public final class ClassMaster extends AbstractNpcAI implements IGameXmlReader
 						htmltext = "test_server_helper020a.html";
 						break;
 					}
+					case MALE_SOLDIER:
 					case TROOPER:
 					{
 						htmltext = "test_server_helper020c.html";
 						break;
 					}
+					case FEMALE_SOLDIER:
 					case WARDER:
 					{
 						htmltext = "test_server_helper020d.html";
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
index 38664264d9..f1e5d98e4e 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
@@ -304,12 +304,7 @@ public final class ClassMaster extends AbstractNpcAI implements IGameXmlReader
 					return null;
 				}
 				
-				int classId = Integer.parseInt(st.nextToken());
-				if (classId == ClassId.FEMALE_SOUL_HOUND.getId())
-				{
-					classId = ClassId.FEOH_SOUL_HOUND.getId(); // Fix for Female Soulhounds
-				}
-				
+				final int classId = Integer.parseInt(st.nextToken());
 				boolean canChange = false;
 				if ((player.isInCategory(CategoryType.SECOND_CLASS_GROUP) || player.isInCategory(CategoryType.FIRST_CLASS_GROUP)) && (player.getLevel() >= 40)) // In retail you can skip first occupation
 				{
@@ -702,11 +697,13 @@ public final class ClassMaster extends AbstractNpcAI implements IGameXmlReader
 						htmltext = "test_server_helper020a.html";
 						break;
 					}
+					case MALE_SOLDIER:
 					case TROOPER:
 					{
 						htmltext = "test_server_helper020c.html";
 						break;
 					}
+					case FEMALE_SOLDIER:
 					case WARDER:
 					{
 						htmltext = "test_server_helper020d.html";