diff --git a/trunk/dist/game/data/scripts/quests/Q10331_StartOfFate/Q10331_StartOfFate.java b/trunk/dist/game/data/scripts/quests/Q10331_StartOfFate/Q10331_StartOfFate.java
index 4945709f24..e62f3b5801 100644
--- a/trunk/dist/game/data/scripts/quests/Q10331_StartOfFate/Q10331_StartOfFate.java
+++ b/trunk/dist/game/data/scripts/quests/Q10331_StartOfFate/Q10331_StartOfFate.java
@@ -19,7 +19,6 @@
 package quests.Q10331_StartOfFate;
 
 import com.l2jserver.gameserver.data.xml.impl.MultisellData;
-import com.l2jserver.gameserver.data.xml.impl.SkillTreesData;
 import com.l2jserver.gameserver.model.Location;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -27,7 +26,6 @@ import com.l2jserver.gameserver.model.quest.Quest;
 import com.l2jserver.gameserver.model.quest.QuestState;
 import com.l2jserver.gameserver.model.quest.State;
 import com.l2jserver.gameserver.network.NpcStringId;
-import com.l2jserver.gameserver.network.serverpackets.ExNewSkillToLearnByLevelUp;
 import com.l2jserver.gameserver.network.serverpackets.ExShowScreenMessage;
 import com.l2jserver.gameserver.network.serverpackets.TutorialShowHtml;
 
@@ -288,10 +286,6 @@ public class Q10331_StartOfFate extends Quest
 			player.sendPacket(new TutorialShowHtml(npc.getObjectId(), "..\\L2Text\\QT_009_enchant_01.htm", TutorialShowHtml.LARGE_WINDOW));
 			MultisellData.getInstance().separateAndSend(717, player, npc, false);
 			player.broadcastUserInfo();
-			if (SkillTreesData.getInstance().hasAvailableSkills(player, player.getClassId()))
-			{
-				player.sendPacket(ExNewSkillToLearnByLevelUp.STATIC_PACKET);
-			}
 			qs.exitQuest(false, true);
 		}
 		
diff --git a/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2PcInstance.java b/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2PcInstance.java
index 0df9f98453..40c3e5f9c8 100644
--- a/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2PcInstance.java
+++ b/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2PcInstance.java
@@ -274,6 +274,7 @@ import com.l2jserver.gameserver.network.serverpackets.ExFishingStart;
 import com.l2jserver.gameserver.network.serverpackets.ExGetBookMarkInfoPacket;
 import com.l2jserver.gameserver.network.serverpackets.ExGetOnAirShip;
 import com.l2jserver.gameserver.network.serverpackets.ExMagicAttackInfo;
+import com.l2jserver.gameserver.network.serverpackets.ExNewSkillToLearnByLevelUp;
 import com.l2jserver.gameserver.network.serverpackets.ExOlympiadMode;
 import com.l2jserver.gameserver.network.serverpackets.ExPledgeCount;
 import com.l2jserver.gameserver.network.serverpackets.ExPrivateStoreSetWholeMsg;
@@ -2378,6 +2379,8 @@ public final class L2PcInstance extends L2Playable
 			
 			sendPacket(new ExSubjobInfo(this, SubclassInfoType.CLASS_CHANGED));
 			
+			setLearningClass(getClassId());
+			
 			// Add AutoGet skills and normal skills and/or learnByFS depending on configurations.
 			rewardSkills();
 			
@@ -2386,6 +2389,12 @@ public final class L2PcInstance extends L2Playable
 				checkPlayerSkills();
 			}
 			
+			// Send ExNewSkillToLearnByLevelUp if there are new skills to learn.
+			if (SkillTreesData.getInstance().hasAvailableSkills(this, getClassId()))
+			{
+				sendPacket(ExNewSkillToLearnByLevelUp.STATIC_PACKET);
+			}
+			
 			notifyFriends(L2FriendStatus.MODE_CLASS);
 		}
 		finally