diff --git a/npc/custom/jobmaster.txt b/npc/custom/jobmaster.txt
index d0da5bee35..80fc73bf2e 100644
--- a/npc/custom/jobmaster.txt
+++ b/npc/custom/jobmaster.txt
@@ -187,8 +187,11 @@ function Job_Menu {
 			jobchange .@i;
 			if (.@i == Job_Novice_High)
 				resetlvl(1);
-			else if (.@i == Job_Baby)
+			else if (.@i == Job_Baby) {
 				resetstatus;
+				resetskill;
+				set SkillPoint,0;
+			}
 			specialeffect2 EF_ANGEL2;
 			specialeffect2 EF_ELECTRIC;
 			if (.Platinum)
@@ -300,4 +303,4 @@ OnInit:
 	.SkillPointCheck = 1;		// Force player to use up all skill points? (1: yes / 0: no)
 	.Platinum = 1;				// Get platinum skills automatically? (1: yes / 0: no)
 	end;
-}
\ No newline at end of file
+}