diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/html/admin/setclass/orc_fighter.htm b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/html/admin/setclass/orc_fighter.htm
index 89a21ed7c1..e67dea0090 100644
--- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/html/admin/setclass/orc_fighter.htm
+++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/html/admin/setclass/orc_fighter.htm
@@ -54,4 +54,26 @@
 <td><button value="Grand Khavatari" action="bypass -h admin_setclass 114" width="130" height="20" back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
 </tr>
 </table>
+<br>
+<center>Vanguard</center>
+<table width="302" border="0" bgcolor="999999">
+<tr>
+<td><center><button value="Orc Lancer" action="bypass -h admin_setclass 217" width="130" height="20" back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></center></td>
+</tr>
+</table>
+<table width="302" border="0" bgcolor="666666">
+<tr>
+<td><center><button value="Rider" action="bypass -h admin_setclass 218" width="130" height="20" back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></center></td>
+</tr>
+</table>
+<table width="302" border="0" bgcolor="0066FF">
+<tr>
+<td><button value="Dragoon" action="bypass -h admin_setclass 219" width="130" height="20" back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+</tr>
+</table>
+<table width="302" border="0" bgcolor="0066FF">
+<tr>
+<td><button value="Vanguard Rider" action="bypass -h admin_setclass 220" width="130" height="20" back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+</tr>
+</table>
 </body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java
index fc0b5e9e29..971461c126 100644
--- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java
+++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java
@@ -429,6 +429,13 @@ public class AdminEditChar implements IAdminCommandHandler
 						}
 					}
 					
+					// Vanguard checks.
+					if (CategoryData.getInstance().isInCategory(CategoryType.VANGUARD_ALL_CLASS, classidval))
+					{
+						player.getAppearance().setMale();
+						player.disarmShield();
+					}
+					
 					final String newclass = ClassListData.getInstance().getClass(player.getClassId()).getClassName();
 					player.store(false);
 					player.broadcastUserInfo();