4 files changed, 13 insertions, 2 deletions
diff --git a/src/map/clif.c b/src/map/clif.c
index 0bcd990..65f5468 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -121,12 +121,12 @@ static void eclif_send_additional_slots(struct map_session_data* sd, struct map_
     equipPos(EQI_HEAD_TOP, LOOK_HEAD_TOP);
     equipPos(EQI_HEAD_MID, LOOK_HEAD_MID);
     equipPos(EQI_GARMENT, LOOK_ROBE);
-    //skip EQI_ARMOR
     equipPos(EQI_SHOES, LOOK_SHOES);
     equipPos(EQI_COSTUME_TOP, 13);
     equipPos(EQI_COSTUME_MID, 14);
     equipPos(EQI_COSTUME_LOW, 15);
     equipPos(EQI_COSTUME_GARMENT, 16);
+    equipPos(EQI_ARMOR, 17);
     //skipping SHADOW slots
 }
 
@@ -139,3 +139,8 @@ void eclif_getareachar_unit_post(struct map_session_data* sd, struct block_list
         eclif_send_additional_slots((struct map_session_data *)bl, sd);
     }
 }
+
+void eclif_authok_post(struct map_session_data *sd)
+{
+    eclif_send_additional_slots(sd, sd);
+}
diff --git a/src/map/clif.h b/src/map/clif.h
index 4aaf033..190df21 100644
--- a/src/map/clif.h
+++ b/src/map/clif.h
@@ -8,5 +8,6 @@ void eclif_quest_send_list(struct map_session_data *sd);
 void eclif_quest_add(struct map_session_data *sd, struct quest *qd);
 void eclif_charnameack(int *fdPtr, struct block_list *bl);
 void eclif_getareachar_unit_post(struct map_session_data* sd, struct block_list *bl);
+void eclif_authok_post(struct map_session_data *sd);
 
 #endif  // EVOL_MAP_CLIF
diff --git a/src/map/init.c b/src/map/init.c
index eeb5785..022428c 100644
--- a/src/map/init.c
+++ b/src/map/init.c
@@ -93,6 +93,7 @@ HPExport void plugin_init (void)
     addHookPre("clif->charnameack", eclif_charnameack);
 
     addHookPost("clif->getareachar_unit", eclif_getareachar_unit_post);
+    addHookPost("clif->authok", eclif_authok_post);
 
     langScriptId = script->add_str("Lang");
 }
diff --git a/src/map/pc.c b/src/map/pc.c
index e958751..0e59e59 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -81,6 +81,7 @@ void epc_equipitem_pos(struct map_session_data *sd, struct item_data *id, int *p
     equipPos2(EQP_COSTUME_HEAD_MID, 14);
     equipPos2(EQP_COSTUME_HEAD_LOW, 15);
     equipPos2(EQP_COSTUME_GARMENT, 16);
+    equipPos2(EQP_ARMOR, 17);
     //skipping SHADOW slots
 }
 
@@ -111,11 +112,14 @@ void epc_unequipitem_pos(struct map_session_data *sd, int *nPtr, int *posPtr)
     unequipPos(EQP_HEAD_TOP, head_top, LOOK_HEAD_TOP);
     unequipPos(EQP_HEAD_MID, head_mid, LOOK_HEAD_MID);
     unequipPos(EQP_GARMENT, robe, LOOK_ROBE);
-    //skip EQP_ARMOR
     unequipPos2(EQP_SHOES, LOOK_SHOES);
     unequipPos2(EQP_COSTUME_HEAD_TOP, 13);
     unequipPos2(EQP_COSTUME_HEAD_MID, 14);
     unequipPos2(EQP_COSTUME_HEAD_LOW, 15);
     unequipPos2(EQP_COSTUME_GARMENT, 16);
+    unequipPos2(EQP_ARMOR, 17);
     //skipping SHADOW slots
 }
+
+#undef unequipPos
+#undef unequipPos2