diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q11025_PathOfDestinyProving/Q11025_PathOfDestinyProving.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q11025_PathOfDestinyProving/Q11025_PathOfDestinyProving.java
index 753be14df6..0d10724367 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q11025_PathOfDestinyProving/Q11025_PathOfDestinyProving.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q11025_PathOfDestinyProving/Q11025_PathOfDestinyProving.java
@@ -456,13 +456,8 @@ public class Q11025_PathOfDestinyProving extends Quest
 	
 	@RegisterEvent(EventType.ON_PLAYER_LOGIN)
 	@RegisterType(ListenerRegisterType.GLOBAL_PLAYERS)
-	public void OnPlayerLogin(OnPlayerLogin event)
+	public void onPlayerLogin(OnPlayerLogin event)
 	{
-		if (Config.DISABLE_TUTORIAL)
-		{
-			return;
-		}
-		
 		final PlayerInstance player = event.getPlayer();
 		if (player == null)
 		{
@@ -482,7 +477,7 @@ public class Q11025_PathOfDestinyProving extends Quest
 		}
 		
 		final QuestState qs = getQuestState(player, false);
-		if ((qs != null) && qs.isCompleted())
+		if (Config.DISABLE_TUTORIAL || ((qs != null) && qs.isCompleted()))
 		{
 			player.sendPacket(ExRequestClassChangeUi.STATIC_PACKET);
 		}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q11026_PathOfDestinyConviction/Q11026_PathOfDestinyConviction.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q11026_PathOfDestinyConviction/Q11026_PathOfDestinyConviction.java
index f373074885..9ace2fb18d 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q11026_PathOfDestinyConviction/Q11026_PathOfDestinyConviction.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q11026_PathOfDestinyConviction/Q11026_PathOfDestinyConviction.java
@@ -209,13 +209,8 @@ public class Q11026_PathOfDestinyConviction extends Quest
 	
 	@RegisterEvent(EventType.ON_PLAYER_LOGIN)
 	@RegisterType(ListenerRegisterType.GLOBAL_PLAYERS)
-	public void OnPlayerLogin(OnPlayerLogin event)
+	public void onPlayerLogin(OnPlayerLogin event)
 	{
-		if (Config.DISABLE_TUTORIAL)
-		{
-			return;
-		}
-		
 		final PlayerInstance player = event.getPlayer();
 		if (player == null)
 		{
@@ -235,7 +230,7 @@ public class Q11026_PathOfDestinyConviction extends Quest
 		}
 		
 		final QuestState qs = getQuestState(player, false);
-		if ((qs != null) && qs.isCompleted())
+		if (Config.DISABLE_TUTORIAL || ((qs != null) && qs.isCompleted()))
 		{
 			player.sendPacket(ExRequestClassChangeUi.STATIC_PACKET);
 		}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q11027_PathOfDestinyOvercome/Q11027_PathOfDestinyOvercome.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q11027_PathOfDestinyOvercome/Q11027_PathOfDestinyOvercome.java
index bf510c41da..c614989533 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q11027_PathOfDestinyOvercome/Q11027_PathOfDestinyOvercome.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q11027_PathOfDestinyOvercome/Q11027_PathOfDestinyOvercome.java
@@ -338,13 +338,8 @@ public class Q11027_PathOfDestinyOvercome extends Quest
 	
 	@RegisterEvent(EventType.ON_PLAYER_LOGIN)
 	@RegisterType(ListenerRegisterType.GLOBAL_PLAYERS)
-	public void OnPlayerLogin(OnPlayerLogin event)
+	public void onPlayerLogin(OnPlayerLogin event)
 	{
-		if (Config.DISABLE_TUTORIAL)
-		{
-			return;
-		}
-		
 		final PlayerInstance player = event.getPlayer();
 		if (player == null)
 		{
@@ -364,7 +359,7 @@ public class Q11027_PathOfDestinyOvercome extends Quest
 		}
 		
 		final QuestState qs = getQuestState(player, false);
-		if ((qs != null) && qs.isCompleted())
+		if (Config.DISABLE_TUTORIAL || ((qs != null) && qs.isCompleted()))
 		{
 			player.sendPacket(ExRequestClassChangeUi.STATIC_PACKET);
 		}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q11031_TrainingBeginsNow/Q11031_TrainingBeginsNow.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q11031_TrainingBeginsNow/Q11031_TrainingBeginsNow.java
index 85ba5fe97f..83d295263b 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q11031_TrainingBeginsNow/Q11031_TrainingBeginsNow.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q11031_TrainingBeginsNow/Q11031_TrainingBeginsNow.java
@@ -243,7 +243,7 @@ public class Q11031_TrainingBeginsNow extends Quest
 	
 	@RegisterEvent(EventType.ON_PLAYER_LOGIN)
 	@RegisterType(ListenerRegisterType.GLOBAL_PLAYERS)
-	public void OnPlayerLogin(OnPlayerLogin event)
+	public void onPlayerLogin(OnPlayerLogin event)
 	{
 		if (Config.DISABLE_TUTORIAL)
 		{
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q11032_CurseOfUndying/Q11032_CurseOfUndying.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q11032_CurseOfUndying/Q11032_CurseOfUndying.java
index 7d8e502c34..e819145561 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q11032_CurseOfUndying/Q11032_CurseOfUndying.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q11032_CurseOfUndying/Q11032_CurseOfUndying.java
@@ -232,13 +232,8 @@ public class Q11032_CurseOfUndying extends Quest
 	
 	@RegisterEvent(EventType.ON_PLAYER_LOGIN)
 	@RegisterType(ListenerRegisterType.GLOBAL_PLAYERS)
-	public void OnPlayerLogin(OnPlayerLogin event)
+	public void onPlayerLogin(OnPlayerLogin event)
 	{
-		if (Config.DISABLE_TUTORIAL)
-		{
-			return;
-		}
-		
 		final PlayerInstance player = event.getPlayer();
 		if ((player == null) || !CategoryData.getInstance().isInCategory(CategoryType.FIRST_CLASS_GROUP, player.getClassId().getId()))
 		{
@@ -252,7 +247,7 @@ public class Q11032_CurseOfUndying extends Quest
 		}
 		
 		final QuestState qs = getQuestState(player, false);
-		if ((qs != null) && qs.isCompleted())
+		if (Config.DISABLE_TUTORIAL || ((qs != null) && qs.isCompleted()))
 		{
 			player.sendPacket(ExRequestClassChangeUi.STATIC_PACKET);
 		}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/ThirdClassTransferQuest.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/ThirdClassTransferQuest.java
index 8adbb1ef72..3819bf74bd 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/ThirdClassTransferQuest.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/ThirdClassTransferQuest.java
@@ -347,7 +347,7 @@ public abstract class ThirdClassTransferQuest extends Quest
 	
 	@RegisterEvent(EventType.ON_PLAYER_LEVEL_CHANGED)
 	@RegisterType(ListenerRegisterType.GLOBAL_PLAYERS)
-	public void OnPlayerLevelChanged(OnPlayerLevelChanged event)
+	public void onPlayerLevelChanged(OnPlayerLevelChanged event)
 	{
 		if (Config.DISABLE_TUTORIAL)
 		{
@@ -365,7 +365,7 @@ public abstract class ThirdClassTransferQuest extends Quest
 	
 	@RegisterEvent(EventType.ON_PLAYER_LOGIN)
 	@RegisterType(ListenerRegisterType.GLOBAL_PLAYERS)
-	public void OnPlayerLogin(OnPlayerLogin event)
+	public void onPlayerLogin(OnPlayerLogin event)
 	{
 		if (Config.DISABLE_TUTORIAL)
 		{
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/classchange/ExRequestClassChangeVerifying.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/classchange/ExRequestClassChangeVerifying.java
index 57d5bfd0b4..9d68f7ec65 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/classchange/ExRequestClassChangeVerifying.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/classchange/ExRequestClassChangeVerifying.java
@@ -42,11 +42,6 @@ public class ExRequestClassChangeVerifying implements IClientIncomingPacket
 	@Override
 	public void run(GameClient client)
 	{
-		if (Config.DISABLE_TUTORIAL)
-		{
-			return;
-		}
-		
 		final PlayerInstance player = client.getPlayer();
 		if (player == null)
 		{
@@ -97,24 +92,44 @@ public class ExRequestClassChangeVerifying implements IClientIncomingPacket
 	
 	private boolean firstClassCheck(PlayerInstance player)
 	{
+		if (Config.DISABLE_TUTORIAL)
+		{
+			return true;
+		}
+		
 		final QuestState qs = player.getQuestState("Q11032_CurseOfUndying");
 		return (qs != null) && qs.isCompleted();
 	}
 	
 	private boolean secondClassCheck(PlayerInstance player)
 	{
+		if (Config.DISABLE_TUTORIAL)
+		{
+			return true;
+		}
+		
 		final QuestState qs = player.getQuestState("Q11025_PathOfDestinyProving");
 		return (qs != null) && qs.isCompleted();
 	}
 	
 	private boolean thirdClassCheck(PlayerInstance player)
 	{
+		if (Config.DISABLE_TUTORIAL)
+		{
+			return true;
+		}
+		
 		final QuestState qs = player.getQuestState("Q11026_PathOfDestinyConviction");
 		return (qs != null) && qs.isCompleted();
 	}
 	
 	private boolean fourthClassCheck(PlayerInstance player)
 	{
+		if (Config.DISABLE_TUTORIAL)
+		{
+			return true;
+		}
+		
 		final QuestState qs = player.getQuestState("Q11027_PathOfDestinyOvercome");
 		return (qs != null) && qs.isCompleted();
 	}
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q11024_PathOfDestinyBeginning/Q11024_PathOfDestinyBeginning.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q11024_PathOfDestinyBeginning/Q11024_PathOfDestinyBeginning.java
index 03475a9479..3aa4eac6cd 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q11024_PathOfDestinyBeginning/Q11024_PathOfDestinyBeginning.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q11024_PathOfDestinyBeginning/Q11024_PathOfDestinyBeginning.java
@@ -409,13 +409,8 @@ public class Q11024_PathOfDestinyBeginning extends Quest
 	
 	@RegisterEvent(EventType.ON_PLAYER_LOGIN)
 	@RegisterType(ListenerRegisterType.GLOBAL_PLAYERS)
-	public void OnPlayerLogin(OnPlayerLogin event)
+	public void onPlayerLogin(OnPlayerLogin event)
 	{
-		if (Config.DISABLE_TUTORIAL)
-		{
-			return;
-		}
-		
 		final PlayerInstance player = event.getPlayer();
 		if (player == null)
 		{
@@ -423,7 +418,7 @@ public class Q11024_PathOfDestinyBeginning extends Quest
 		}
 		
 		final QuestState qs = getQuestState(player, false);
-		if ((qs == null) || (player.getLevel() < 20))
+		if (!Config.DISABLE_TUTORIAL && (qs == null) && (player.getLevel() < 20))
 		{
 			showOnScreenMsg(player, NpcStringId.TARTI_IS_WORRIED_ABOUT_S1, ExShowScreenMessage.TOP_CENTER, 10000, player.getName());
 			return;
@@ -434,7 +429,7 @@ public class Q11024_PathOfDestinyBeginning extends Quest
 			return;
 		}
 		
-		if (qs.isCompleted())
+		if (Config.DISABLE_TUTORIAL || ((qs != null) && qs.isCompleted()))
 		{
 			player.sendPacket(ExClassChangeSetAlarm.STATIC_PACKET);
 		}
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q11025_PathOfDestinyProving/Q11025_PathOfDestinyProving.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q11025_PathOfDestinyProving/Q11025_PathOfDestinyProving.java
index 432d258228..6727cc0c22 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q11025_PathOfDestinyProving/Q11025_PathOfDestinyProving.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q11025_PathOfDestinyProving/Q11025_PathOfDestinyProving.java
@@ -780,13 +780,8 @@ public class Q11025_PathOfDestinyProving extends Quest
 	
 	@RegisterEvent(EventType.ON_PLAYER_LOGIN)
 	@RegisterType(ListenerRegisterType.GLOBAL_PLAYERS)
-	public void OnPlayerLogin(OnPlayerLogin event)
+	public void onPlayerLogin(OnPlayerLogin event)
 	{
-		if (Config.DISABLE_TUTORIAL)
-		{
-			return;
-		}
-		
 		final PlayerInstance player = event.getPlayer();
 		if (player == null)
 		{
@@ -799,7 +794,7 @@ public class Q11025_PathOfDestinyProving extends Quest
 		}
 		
 		final QuestState qs = getQuestState(player, false);
-		if ((qs != null) && qs.isCompleted())
+		if (Config.DISABLE_TUTORIAL || ((qs != null) && qs.isCompleted()))
 		{
 			player.sendPacket(ExClassChangeSetAlarm.STATIC_PACKET);
 		}
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q11026_PathOfDestinyConviction/Q11026_PathOfDestinyConviction.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q11026_PathOfDestinyConviction/Q11026_PathOfDestinyConviction.java
index 26ce2ec5ef..3c480e45e8 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q11026_PathOfDestinyConviction/Q11026_PathOfDestinyConviction.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q11026_PathOfDestinyConviction/Q11026_PathOfDestinyConviction.java
@@ -660,13 +660,8 @@ public class Q11026_PathOfDestinyConviction extends Quest
 	
 	@RegisterEvent(EventType.ON_PLAYER_LOGIN)
 	@RegisterType(ListenerRegisterType.GLOBAL_PLAYERS)
-	public void OnPlayerLogin(OnPlayerLogin event)
+	public void onPlayerLogin(OnPlayerLogin event)
 	{
-		if (Config.DISABLE_TUTORIAL)
-		{
-			return;
-		}
-		
 		final PlayerInstance player = event.getPlayer();
 		if (player == null)
 		{
@@ -679,7 +674,7 @@ public class Q11026_PathOfDestinyConviction extends Quest
 		}
 		
 		final QuestState qs = getQuestState(player, false);
-		if ((qs != null) && qs.isCompleted())
+		if (Config.DISABLE_TUTORIAL || ((qs != null) && qs.isCompleted()))
 		{
 			player.sendPacket(ExClassChangeSetAlarm.STATIC_PACKET);
 		}
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q11027_PathOfDestinyOvercome/Q11027_PathOfDestinyOvercome.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q11027_PathOfDestinyOvercome/Q11027_PathOfDestinyOvercome.java
index bdad4e0809..97f08ea7cb 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q11027_PathOfDestinyOvercome/Q11027_PathOfDestinyOvercome.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q11027_PathOfDestinyOvercome/Q11027_PathOfDestinyOvercome.java
@@ -327,13 +327,10 @@ public class Q11027_PathOfDestinyOvercome extends Quest
 			}
 			case "34505-10.html":
 			{
-				if (player.getLevel() >= LEVEL_85)
+				if ((player.getLevel() >= LEVEL_85) && qs.isCond(19))
 				{
-					if (qs.isCond(19))
-					{
-						qs.setCond(20, true);
-						htmltext = event;
-					}
+					qs.setCond(20, true);
+					htmltext = event;
 				}
 				break;
 			}
@@ -865,13 +862,8 @@ public class Q11027_PathOfDestinyOvercome extends Quest
 	
 	@RegisterEvent(EventType.ON_PLAYER_LOGIN)
 	@RegisterType(ListenerRegisterType.GLOBAL_PLAYERS)
-	public void OnPlayerLogin(OnPlayerLogin event)
+	public void onPlayerLogin(OnPlayerLogin event)
 	{
-		if (Config.DISABLE_TUTORIAL)
-		{
-			return;
-		}
-		
 		final PlayerInstance player = event.getPlayer();
 		if (player == null)
 		{
@@ -884,7 +876,7 @@ public class Q11027_PathOfDestinyOvercome extends Quest
 		}
 		
 		final QuestState qs = getQuestState(player, false);
-		if ((qs != null) && qs.isCompleted())
+		if (Config.DISABLE_TUTORIAL || ((qs != null) && qs.isCompleted()))
 		{
 			player.sendPacket(ExClassChangeSetAlarm.STATIC_PACKET);
 		}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/classchange/ExRequestClassChangeVerifying.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/classchange/ExRequestClassChangeVerifying.java
index 9bed160c8b..bebf574223 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/classchange/ExRequestClassChangeVerifying.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/classchange/ExRequestClassChangeVerifying.java
@@ -42,11 +42,6 @@ public class ExRequestClassChangeVerifying implements IClientIncomingPacket
 	@Override
 	public void run(GameClient client)
 	{
-		if (Config.DISABLE_TUTORIAL)
-		{
-			return;
-		}
-		
 		final PlayerInstance player = client.getPlayer();
 		if (player == null)
 		{
@@ -97,24 +92,44 @@ public class ExRequestClassChangeVerifying implements IClientIncomingPacket
 	
 	private boolean firstClassCheck(PlayerInstance player)
 	{
+		if (Config.DISABLE_TUTORIAL)
+		{
+			return true;
+		}
+		
 		final QuestState qs = player.getQuestState("Q11024_PathOfDestinyBeginning");
 		return (qs != null) && qs.isCompleted();
 	}
 	
 	private boolean secondClassCheck(PlayerInstance player)
 	{
+		if (Config.DISABLE_TUTORIAL)
+		{
+			return true;
+		}
+		
 		final QuestState qs = player.getQuestState("Q11025_PathOfDestinyProving");
 		return (qs != null) && qs.isCompleted();
 	}
 	
 	private boolean thirdClassCheck(PlayerInstance player)
 	{
+		if (Config.DISABLE_TUTORIAL)
+		{
+			return true;
+		}
+		
 		final QuestState qs = player.getQuestState("Q11026_PathOfDestinyConviction");
 		return (qs != null) && qs.isCompleted();
 	}
 	
 	private boolean fourthClassCheck(PlayerInstance player)
 	{
+		if (Config.DISABLE_TUTORIAL)
+		{
+			return true;
+		}
+		
 		final QuestState qs = player.getQuestState("Q11027_PathOfDestinyOvercome");
 		return (qs != null) && qs.isCompleted();
 	}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q11024_PathOfDestinyBeginning/Q11024_PathOfDestinyBeginning.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q11024_PathOfDestinyBeginning/Q11024_PathOfDestinyBeginning.java
index 0cbad50896..3a8aa427e0 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q11024_PathOfDestinyBeginning/Q11024_PathOfDestinyBeginning.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q11024_PathOfDestinyBeginning/Q11024_PathOfDestinyBeginning.java
@@ -408,13 +408,8 @@ public class Q11024_PathOfDestinyBeginning extends Quest
 	
 	@RegisterEvent(EventType.ON_PLAYER_LOGIN)
 	@RegisterType(ListenerRegisterType.GLOBAL_PLAYERS)
-	public void OnPlayerLogin(OnPlayerLogin event)
+	public void onPlayerLogin(OnPlayerLogin event)
 	{
-		if (Config.DISABLE_TUTORIAL)
-		{
-			return;
-		}
-		
 		final PlayerInstance player = event.getPlayer();
 		if (player == null)
 		{
@@ -422,7 +417,7 @@ public class Q11024_PathOfDestinyBeginning extends Quest
 		}
 		
 		final QuestState qs = getQuestState(player, false);
-		if ((qs == null) || (player.getLevel() < 20))
+		if (!Config.DISABLE_TUTORIAL && (qs == null) && (player.getLevel() < 20))
 		{
 			showOnScreenMsg(player, NpcStringId.TARTI_IS_WORRIED_ABOUT_S1, ExShowScreenMessage.TOP_CENTER, 10000, player.getName());
 			return;
@@ -433,7 +428,7 @@ public class Q11024_PathOfDestinyBeginning extends Quest
 			return;
 		}
 		
-		if (qs.isCompleted())
+		if (Config.DISABLE_TUTORIAL || ((qs != null) && qs.isCompleted()))
 		{
 			player.sendPacket(ExClassChangeSetAlarm.STATIC_PACKET);
 		}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q11025_PathOfDestinyProving/Q11025_PathOfDestinyProving.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q11025_PathOfDestinyProving/Q11025_PathOfDestinyProving.java
index 5b50324584..104bc10c75 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q11025_PathOfDestinyProving/Q11025_PathOfDestinyProving.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q11025_PathOfDestinyProving/Q11025_PathOfDestinyProving.java
@@ -773,13 +773,8 @@ public class Q11025_PathOfDestinyProving extends Quest
 	
 	@RegisterEvent(EventType.ON_PLAYER_LOGIN)
 	@RegisterType(ListenerRegisterType.GLOBAL_PLAYERS)
-	public void OnPlayerLogin(OnPlayerLogin event)
+	public void onPlayerLogin(OnPlayerLogin event)
 	{
-		if (Config.DISABLE_TUTORIAL)
-		{
-			return;
-		}
-		
 		final PlayerInstance player = event.getPlayer();
 		if (player == null)
 		{
@@ -792,7 +787,7 @@ public class Q11025_PathOfDestinyProving extends Quest
 		}
 		
 		final QuestState qs = getQuestState(player, false);
-		if ((qs != null) && qs.isCompleted())
+		if (Config.DISABLE_TUTORIAL || ((qs != null) && qs.isCompleted()))
 		{
 			player.sendPacket(ExClassChangeSetAlarm.STATIC_PACKET);
 		}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q11026_PathOfDestinyConviction/Q11026_PathOfDestinyConviction.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q11026_PathOfDestinyConviction/Q11026_PathOfDestinyConviction.java
index 17bf87eb21..09164f453a 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q11026_PathOfDestinyConviction/Q11026_PathOfDestinyConviction.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q11026_PathOfDestinyConviction/Q11026_PathOfDestinyConviction.java
@@ -652,13 +652,8 @@ public class Q11026_PathOfDestinyConviction extends Quest
 	
 	@RegisterEvent(EventType.ON_PLAYER_LOGIN)
 	@RegisterType(ListenerRegisterType.GLOBAL_PLAYERS)
-	public void OnPlayerLogin(OnPlayerLogin event)
+	public void onPlayerLogin(OnPlayerLogin event)
 	{
-		if (Config.DISABLE_TUTORIAL)
-		{
-			return;
-		}
-		
 		final PlayerInstance player = event.getPlayer();
 		if (player == null)
 		{
@@ -671,7 +666,7 @@ public class Q11026_PathOfDestinyConviction extends Quest
 		}
 		
 		final QuestState qs = getQuestState(player, false);
-		if ((qs != null) && qs.isCompleted())
+		if (Config.DISABLE_TUTORIAL || ((qs != null) && qs.isCompleted()))
 		{
 			player.sendPacket(ExClassChangeSetAlarm.STATIC_PACKET);
 		}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q11027_PathOfDestinyOvercome/Q11027_PathOfDestinyOvercome.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q11027_PathOfDestinyOvercome/Q11027_PathOfDestinyOvercome.java
index 2582c94e97..0b7eec39dc 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q11027_PathOfDestinyOvercome/Q11027_PathOfDestinyOvercome.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q11027_PathOfDestinyOvercome/Q11027_PathOfDestinyOvercome.java
@@ -325,13 +325,10 @@ public class Q11027_PathOfDestinyOvercome extends Quest
 			}
 			case "34505-10.html":
 			{
-				if (player.getLevel() >= LEVEL_85)
+				if ((player.getLevel() >= LEVEL_85) && qs.isCond(19))
 				{
-					if (qs.isCond(19))
-					{
-						qs.setCond(20, true);
-						htmltext = event;
-					}
+					qs.setCond(20, true);
+					htmltext = event;
 				}
 				break;
 			}
@@ -857,13 +854,8 @@ public class Q11027_PathOfDestinyOvercome extends Quest
 	
 	@RegisterEvent(EventType.ON_PLAYER_LOGIN)
 	@RegisterType(ListenerRegisterType.GLOBAL_PLAYERS)
-	public void OnPlayerLogin(OnPlayerLogin event)
+	public void onPlayerLogin(OnPlayerLogin event)
 	{
-		if (Config.DISABLE_TUTORIAL)
-		{
-			return;
-		}
-		
 		final PlayerInstance player = event.getPlayer();
 		if (player == null)
 		{
@@ -876,7 +868,7 @@ public class Q11027_PathOfDestinyOvercome extends Quest
 		}
 		
 		final QuestState qs = getQuestState(player, false);
-		if ((qs != null) && qs.isCompleted())
+		if (Config.DISABLE_TUTORIAL || ((qs != null) && qs.isCompleted()))
 		{
 			player.sendPacket(ExClassChangeSetAlarm.STATIC_PACKET);
 		}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/classchange/ExRequestClassChangeVerifying.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/classchange/ExRequestClassChangeVerifying.java
index 9bed160c8b..bebf574223 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/classchange/ExRequestClassChangeVerifying.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/classchange/ExRequestClassChangeVerifying.java
@@ -42,11 +42,6 @@ public class ExRequestClassChangeVerifying implements IClientIncomingPacket
 	@Override
 	public void run(GameClient client)
 	{
-		if (Config.DISABLE_TUTORIAL)
-		{
-			return;
-		}
-		
 		final PlayerInstance player = client.getPlayer();
 		if (player == null)
 		{
@@ -97,24 +92,44 @@ public class ExRequestClassChangeVerifying implements IClientIncomingPacket
 	
 	private boolean firstClassCheck(PlayerInstance player)
 	{
+		if (Config.DISABLE_TUTORIAL)
+		{
+			return true;
+		}
+		
 		final QuestState qs = player.getQuestState("Q11024_PathOfDestinyBeginning");
 		return (qs != null) && qs.isCompleted();
 	}
 	
 	private boolean secondClassCheck(PlayerInstance player)
 	{
+		if (Config.DISABLE_TUTORIAL)
+		{
+			return true;
+		}
+		
 		final QuestState qs = player.getQuestState("Q11025_PathOfDestinyProving");
 		return (qs != null) && qs.isCompleted();
 	}
 	
 	private boolean thirdClassCheck(PlayerInstance player)
 	{
+		if (Config.DISABLE_TUTORIAL)
+		{
+			return true;
+		}
+		
 		final QuestState qs = player.getQuestState("Q11026_PathOfDestinyConviction");
 		return (qs != null) && qs.isCompleted();
 	}
 	
 	private boolean fourthClassCheck(PlayerInstance player)
 	{
+		if (Config.DISABLE_TUTORIAL)
+		{
+			return true;
+		}
+		
 		final QuestState qs = player.getQuestState("Q11027_PathOfDestinyOvercome");
 		return (qs != null) && qs.isCompleted();
 	}
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/quests/Q11024_PathOfDestinyBeginning/Q11024_PathOfDestinyBeginning.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/quests/Q11024_PathOfDestinyBeginning/Q11024_PathOfDestinyBeginning.java
index 0cbad50896..3a8aa427e0 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/quests/Q11024_PathOfDestinyBeginning/Q11024_PathOfDestinyBeginning.java
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/quests/Q11024_PathOfDestinyBeginning/Q11024_PathOfDestinyBeginning.java
@@ -408,13 +408,8 @@ public class Q11024_PathOfDestinyBeginning extends Quest
 	
 	@RegisterEvent(EventType.ON_PLAYER_LOGIN)
 	@RegisterType(ListenerRegisterType.GLOBAL_PLAYERS)
-	public void OnPlayerLogin(OnPlayerLogin event)
+	public void onPlayerLogin(OnPlayerLogin event)
 	{
-		if (Config.DISABLE_TUTORIAL)
-		{
-			return;
-		}
-		
 		final PlayerInstance player = event.getPlayer();
 		if (player == null)
 		{
@@ -422,7 +417,7 @@ public class Q11024_PathOfDestinyBeginning extends Quest
 		}
 		
 		final QuestState qs = getQuestState(player, false);
-		if ((qs == null) || (player.getLevel() < 20))
+		if (!Config.DISABLE_TUTORIAL && (qs == null) && (player.getLevel() < 20))
 		{
 			showOnScreenMsg(player, NpcStringId.TARTI_IS_WORRIED_ABOUT_S1, ExShowScreenMessage.TOP_CENTER, 10000, player.getName());
 			return;
@@ -433,7 +428,7 @@ public class Q11024_PathOfDestinyBeginning extends Quest
 			return;
 		}
 		
-		if (qs.isCompleted())
+		if (Config.DISABLE_TUTORIAL || ((qs != null) && qs.isCompleted()))
 		{
 			player.sendPacket(ExClassChangeSetAlarm.STATIC_PACKET);
 		}
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/quests/Q11025_PathOfDestinyProving/Q11025_PathOfDestinyProving.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/quests/Q11025_PathOfDestinyProving/Q11025_PathOfDestinyProving.java
index 5b50324584..104bc10c75 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/quests/Q11025_PathOfDestinyProving/Q11025_PathOfDestinyProving.java
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/quests/Q11025_PathOfDestinyProving/Q11025_PathOfDestinyProving.java
@@ -773,13 +773,8 @@ public class Q11025_PathOfDestinyProving extends Quest
 	
 	@RegisterEvent(EventType.ON_PLAYER_LOGIN)
 	@RegisterType(ListenerRegisterType.GLOBAL_PLAYERS)
-	public void OnPlayerLogin(OnPlayerLogin event)
+	public void onPlayerLogin(OnPlayerLogin event)
 	{
-		if (Config.DISABLE_TUTORIAL)
-		{
-			return;
-		}
-		
 		final PlayerInstance player = event.getPlayer();
 		if (player == null)
 		{
@@ -792,7 +787,7 @@ public class Q11025_PathOfDestinyProving extends Quest
 		}
 		
 		final QuestState qs = getQuestState(player, false);
-		if ((qs != null) && qs.isCompleted())
+		if (Config.DISABLE_TUTORIAL || ((qs != null) && qs.isCompleted()))
 		{
 			player.sendPacket(ExClassChangeSetAlarm.STATIC_PACKET);
 		}
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/quests/Q11026_PathOfDestinyConviction/Q11026_PathOfDestinyConviction.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/quests/Q11026_PathOfDestinyConviction/Q11026_PathOfDestinyConviction.java
index 17bf87eb21..09164f453a 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/quests/Q11026_PathOfDestinyConviction/Q11026_PathOfDestinyConviction.java
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/quests/Q11026_PathOfDestinyConviction/Q11026_PathOfDestinyConviction.java
@@ -652,13 +652,8 @@ public class Q11026_PathOfDestinyConviction extends Quest
 	
 	@RegisterEvent(EventType.ON_PLAYER_LOGIN)
 	@RegisterType(ListenerRegisterType.GLOBAL_PLAYERS)
-	public void OnPlayerLogin(OnPlayerLogin event)
+	public void onPlayerLogin(OnPlayerLogin event)
 	{
-		if (Config.DISABLE_TUTORIAL)
-		{
-			return;
-		}
-		
 		final PlayerInstance player = event.getPlayer();
 		if (player == null)
 		{
@@ -671,7 +666,7 @@ public class Q11026_PathOfDestinyConviction extends Quest
 		}
 		
 		final QuestState qs = getQuestState(player, false);
-		if ((qs != null) && qs.isCompleted())
+		if (Config.DISABLE_TUTORIAL || ((qs != null) && qs.isCompleted()))
 		{
 			player.sendPacket(ExClassChangeSetAlarm.STATIC_PACKET);
 		}
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/quests/Q11027_PathOfDestinyOvercome/Q11027_PathOfDestinyOvercome.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/quests/Q11027_PathOfDestinyOvercome/Q11027_PathOfDestinyOvercome.java
index 2582c94e97..0b7eec39dc 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/quests/Q11027_PathOfDestinyOvercome/Q11027_PathOfDestinyOvercome.java
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/quests/Q11027_PathOfDestinyOvercome/Q11027_PathOfDestinyOvercome.java
@@ -325,13 +325,10 @@ public class Q11027_PathOfDestinyOvercome extends Quest
 			}
 			case "34505-10.html":
 			{
-				if (player.getLevel() >= LEVEL_85)
+				if ((player.getLevel() >= LEVEL_85) && qs.isCond(19))
 				{
-					if (qs.isCond(19))
-					{
-						qs.setCond(20, true);
-						htmltext = event;
-					}
+					qs.setCond(20, true);
+					htmltext = event;
 				}
 				break;
 			}
@@ -857,13 +854,8 @@ public class Q11027_PathOfDestinyOvercome extends Quest
 	
 	@RegisterEvent(EventType.ON_PLAYER_LOGIN)
 	@RegisterType(ListenerRegisterType.GLOBAL_PLAYERS)
-	public void OnPlayerLogin(OnPlayerLogin event)
+	public void onPlayerLogin(OnPlayerLogin event)
 	{
-		if (Config.DISABLE_TUTORIAL)
-		{
-			return;
-		}
-		
 		final PlayerInstance player = event.getPlayer();
 		if (player == null)
 		{
@@ -876,7 +868,7 @@ public class Q11027_PathOfDestinyOvercome extends Quest
 		}
 		
 		final QuestState qs = getQuestState(player, false);
-		if ((qs != null) && qs.isCompleted())
+		if (Config.DISABLE_TUTORIAL || ((qs != null) && qs.isCompleted()))
 		{
 			player.sendPacket(ExClassChangeSetAlarm.STATIC_PACKET);
 		}
diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/classchange/ExRequestClassChangeVerifying.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/classchange/ExRequestClassChangeVerifying.java
index 9bed160c8b..bebf574223 100644
--- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/classchange/ExRequestClassChangeVerifying.java
+++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/classchange/ExRequestClassChangeVerifying.java
@@ -42,11 +42,6 @@ public class ExRequestClassChangeVerifying implements IClientIncomingPacket
 	@Override
 	public void run(GameClient client)
 	{
-		if (Config.DISABLE_TUTORIAL)
-		{
-			return;
-		}
-		
 		final PlayerInstance player = client.getPlayer();
 		if (player == null)
 		{
@@ -97,24 +92,44 @@ public class ExRequestClassChangeVerifying implements IClientIncomingPacket
 	
 	private boolean firstClassCheck(PlayerInstance player)
 	{
+		if (Config.DISABLE_TUTORIAL)
+		{
+			return true;
+		}
+		
 		final QuestState qs = player.getQuestState("Q11024_PathOfDestinyBeginning");
 		return (qs != null) && qs.isCompleted();
 	}
 	
 	private boolean secondClassCheck(PlayerInstance player)
 	{
+		if (Config.DISABLE_TUTORIAL)
+		{
+			return true;
+		}
+		
 		final QuestState qs = player.getQuestState("Q11025_PathOfDestinyProving");
 		return (qs != null) && qs.isCompleted();
 	}
 	
 	private boolean thirdClassCheck(PlayerInstance player)
 	{
+		if (Config.DISABLE_TUTORIAL)
+		{
+			return true;
+		}
+		
 		final QuestState qs = player.getQuestState("Q11026_PathOfDestinyConviction");
 		return (qs != null) && qs.isCompleted();
 	}
 	
 	private boolean fourthClassCheck(PlayerInstance player)
 	{
+		if (Config.DISABLE_TUTORIAL)
+		{
+			return true;
+		}
+		
 		final QuestState qs = player.getQuestState("Q11027_PathOfDestinyOvercome");
 		return (qs != null) && qs.isCompleted();
 	}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/SecondClassChange.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/SecondClassChange.java
index 17450cf69c..cbd96d92cb 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/SecondClassChange.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/SecondClassChange.java
@@ -16,7 +16,6 @@
  */
 package ai.others;
 
-import org.l2jmobius.Config;
 import org.l2jmobius.gameserver.data.xml.CategoryData;
 import org.l2jmobius.gameserver.enums.CategoryType;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@@ -40,13 +39,8 @@ public class SecondClassChange extends AbstractNpcAI
 	
 	@RegisterEvent(EventType.ON_PLAYER_LEVEL_CHANGED)
 	@RegisterType(ListenerRegisterType.GLOBAL_PLAYERS)
-	public void OnPlayerLevelChanged(OnPlayerLevelChanged event)
+	public void onPlayerLevelChanged(OnPlayerLevelChanged event)
 	{
-		if (Config.DISABLE_TUTORIAL)
-		{
-			return;
-		}
-		
 		final PlayerInstance player = event.getPlayer();
 		if (player == null)
 		{
@@ -63,13 +57,8 @@ public class SecondClassChange extends AbstractNpcAI
 	
 	@RegisterEvent(EventType.ON_PLAYER_LOGIN)
 	@RegisterType(ListenerRegisterType.GLOBAL_PLAYERS)
-	public void OnPlayerLogin(OnPlayerLogin event)
+	public void onPlayerLogin(OnPlayerLogin event)
 	{
-		if (Config.DISABLE_TUTORIAL)
-		{
-			return;
-		}
-		
 		final PlayerInstance player = event.getPlayer();
 		if (player == null)
 		{
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q10673_SagaOfLegend/Q10673_SagaOfLegend.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q10673_SagaOfLegend/Q10673_SagaOfLegend.java
index 732564f920..fe1fdf3887 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q10673_SagaOfLegend/Q10673_SagaOfLegend.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q10673_SagaOfLegend/Q10673_SagaOfLegend.java
@@ -256,13 +256,8 @@ public class Q10673_SagaOfLegend extends Quest
 	
 	@RegisterEvent(EventType.ON_PLAYER_LOGIN)
 	@RegisterType(ListenerRegisterType.GLOBAL_PLAYERS)
-	public void OnPlayerLogin(OnPlayerLogin event)
+	public void onPlayerLogin(OnPlayerLogin event)
 	{
-		if (Config.DISABLE_TUTORIAL)
-		{
-			return;
-		}
-		
 		final PlayerInstance player = event.getPlayer();
 		if (player == null)
 		{
@@ -275,7 +270,7 @@ public class Q10673_SagaOfLegend extends Quest
 		}
 		
 		final QuestState qs = getQuestState(player, false);
-		if ((qs != null) && qs.isCompleted())
+		if (Config.DISABLE_TUTORIAL || ((qs != null) && qs.isCompleted()))
 		{
 			player.sendPacket(ExRequestClassChangeUi.STATIC_PACKET);
 		}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q10962_NewHorizons/Q10962_NewHorizons.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q10962_NewHorizons/Q10962_NewHorizons.java
index c6de8b2de9..c30611dd1e 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q10962_NewHorizons/Q10962_NewHorizons.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q10962_NewHorizons/Q10962_NewHorizons.java
@@ -295,13 +295,8 @@ public class Q10962_NewHorizons extends Quest
 	
 	@RegisterEvent(EventType.ON_PLAYER_LOGIN)
 	@RegisterType(ListenerRegisterType.GLOBAL_PLAYERS)
-	public void OnPlayerLogin(OnPlayerLogin event)
+	public void onPlayerLogin(OnPlayerLogin event)
 	{
-		if (Config.DISABLE_TUTORIAL)
-		{
-			return;
-		}
-		
 		final PlayerInstance player = event.getPlayer();
 		if (player == null)
 		{
@@ -314,7 +309,7 @@ public class Q10962_NewHorizons extends Quest
 		}
 		
 		final QuestState qs = getQuestState(player, false);
-		if ((qs != null) && qs.isCompleted())
+		if (Config.DISABLE_TUTORIAL || ((qs != null) && qs.isCompleted()))
 		{
 			player.sendPacket(ExRequestClassChangeUi.STATIC_PACKET);
 		}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q10982_SpiderHunt/Q10982_SpiderHunt.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q10982_SpiderHunt/Q10982_SpiderHunt.java
index 0c215ade90..61c0dd7d5d 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q10982_SpiderHunt/Q10982_SpiderHunt.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q10982_SpiderHunt/Q10982_SpiderHunt.java
@@ -294,13 +294,8 @@ public class Q10982_SpiderHunt extends Quest
 	
 	@RegisterEvent(EventType.ON_PLAYER_LOGIN)
 	@RegisterType(ListenerRegisterType.GLOBAL_PLAYERS)
-	public void OnPlayerLogin(OnPlayerLogin event)
+	public void onPlayerLogin(OnPlayerLogin event)
 	{
-		if (Config.DISABLE_TUTORIAL)
-		{
-			return;
-		}
-		
 		final PlayerInstance player = event.getPlayer();
 		if (player == null)
 		{
@@ -313,7 +308,7 @@ public class Q10982_SpiderHunt extends Quest
 		}
 		
 		final QuestState qs = getQuestState(player, false);
-		if ((qs != null) && qs.isCompleted())
+		if (Config.DISABLE_TUTORIAL || ((qs != null) && qs.isCompleted()))
 		{
 			player.sendPacket(ExRequestClassChangeUi.STATIC_PACKET);
 		}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q10984_CollectSpiderweb/Q10984_CollectSpiderweb.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q10984_CollectSpiderweb/Q10984_CollectSpiderweb.java
index 340c355d7c..a4aa0dda44 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q10984_CollectSpiderweb/Q10984_CollectSpiderweb.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q10984_CollectSpiderweb/Q10984_CollectSpiderweb.java
@@ -273,13 +273,8 @@ public class Q10984_CollectSpiderweb extends Quest
 	
 	@RegisterEvent(EventType.ON_PLAYER_LOGIN)
 	@RegisterType(ListenerRegisterType.GLOBAL_PLAYERS)
-	public void OnPlayerLogin(OnPlayerLogin event)
+	public void onPlayerLogin(OnPlayerLogin event)
 	{
-		if (Config.DISABLE_TUTORIAL)
-		{
-			return;
-		}
-		
 		final PlayerInstance player = event.getPlayer();
 		if (player == null)
 		{
@@ -292,7 +287,7 @@ public class Q10984_CollectSpiderweb extends Quest
 		}
 		
 		final QuestState qs = getQuestState(player, false);
-		if ((qs != null) && qs.isCompleted())
+		if (Config.DISABLE_TUTORIAL || ((qs != null) && qs.isCompleted()))
 		{
 			player.sendPacket(ExRequestClassChangeUi.STATIC_PACKET);
 		}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q10986_SwampMonster/Q10986_SwampMonster.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q10986_SwampMonster/Q10986_SwampMonster.java
index 0b087e5019..f15c97fde9 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q10986_SwampMonster/Q10986_SwampMonster.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q10986_SwampMonster/Q10986_SwampMonster.java
@@ -295,13 +295,8 @@ public class Q10986_SwampMonster extends Quest
 	
 	@RegisterEvent(EventType.ON_PLAYER_LOGIN)
 	@RegisterType(ListenerRegisterType.GLOBAL_PLAYERS)
-	public void OnPlayerLogin(OnPlayerLogin event)
+	public void onPlayerLogin(OnPlayerLogin event)
 	{
-		if (Config.DISABLE_TUTORIAL)
-		{
-			return;
-		}
-		
 		final PlayerInstance player = event.getPlayer();
 		if (player == null)
 		{
@@ -314,7 +309,7 @@ public class Q10986_SwampMonster extends Quest
 		}
 		
 		final QuestState qs = getQuestState(player, false);
-		if ((qs != null) && qs.isCompleted())
+		if (Config.DISABLE_TUTORIAL || ((qs != null) && qs.isCompleted()))
 		{
 			player.sendPacket(ExRequestClassChangeUi.STATIC_PACKET);
 		}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q10988_Conspiracy/Q10988_Conspiracy.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q10988_Conspiracy/Q10988_Conspiracy.java
index 3490f93e30..575e9fd24e 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q10988_Conspiracy/Q10988_Conspiracy.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q10988_Conspiracy/Q10988_Conspiracy.java
@@ -295,13 +295,8 @@ public class Q10988_Conspiracy extends Quest
 	
 	@RegisterEvent(EventType.ON_PLAYER_LOGIN)
 	@RegisterType(ListenerRegisterType.GLOBAL_PLAYERS)
-	public void OnPlayerLogin(OnPlayerLogin event)
+	public void onPlayerLogin(OnPlayerLogin event)
 	{
-		if (Config.DISABLE_TUTORIAL)
-		{
-			return;
-		}
-		
 		final PlayerInstance player = event.getPlayer();
 		if (player == null)
 		{
@@ -314,7 +309,7 @@ public class Q10988_Conspiracy extends Quest
 		}
 		
 		final QuestState qs = getQuestState(player, false);
-		if ((qs != null) && qs.isCompleted())
+		if (Config.DISABLE_TUTORIAL || ((qs != null) && qs.isCompleted()))
 		{
 			player.sendPacket(ExRequestClassChangeUi.STATIC_PACKET);
 		}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q10990_PoisonExtraction/Q10990_PoisonExtraction.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q10990_PoisonExtraction/Q10990_PoisonExtraction.java
index d76d5fffb1..5cf925b2d8 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q10990_PoisonExtraction/Q10990_PoisonExtraction.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q10990_PoisonExtraction/Q10990_PoisonExtraction.java
@@ -293,13 +293,8 @@ public class Q10990_PoisonExtraction extends Quest
 	
 	@RegisterEvent(EventType.ON_PLAYER_LOGIN)
 	@RegisterType(ListenerRegisterType.GLOBAL_PLAYERS)
-	public void OnPlayerLogin(OnPlayerLogin event)
+	public void onPlayerLogin(OnPlayerLogin event)
 	{
-		if (Config.DISABLE_TUTORIAL)
-		{
-			return;
-		}
-		
 		final PlayerInstance player = event.getPlayer();
 		if (player == null)
 		{
@@ -312,7 +307,7 @@ public class Q10990_PoisonExtraction extends Quest
 		}
 		
 		final QuestState qs = getQuestState(player, false);
-		if ((qs != null) && qs.isCompleted())
+		if (Config.DISABLE_TUTORIAL || ((qs != null) && qs.isCompleted()))
 		{
 			player.sendPacket(ExRequestClassChangeUi.STATIC_PACKET);
 		}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/classchange/ExRequestClassChangeVerifying.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/classchange/ExRequestClassChangeVerifying.java
index 63b3f7e2da..c3a4b962d2 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/classchange/ExRequestClassChangeVerifying.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/classchange/ExRequestClassChangeVerifying.java
@@ -42,11 +42,6 @@ public class ExRequestClassChangeVerifying implements IClientIncomingPacket
 	@Override
 	public void run(GameClient client)
 	{
-		if (Config.DISABLE_TUTORIAL)
-		{
-			return;
-		}
-		
 		final PlayerInstance player = client.getPlayer();
 		if (player == null)
 		{
@@ -90,6 +85,11 @@ public class ExRequestClassChangeVerifying implements IClientIncomingPacket
 	
 	private boolean firstClassCheck(PlayerInstance player)
 	{
+		if (Config.DISABLE_TUTORIAL)
+		{
+			return true;
+		}
+		
 		QuestState qs = null;
 		switch (player.getRace())
 		{
@@ -135,6 +135,11 @@ public class ExRequestClassChangeVerifying implements IClientIncomingPacket
 	
 	private boolean thirdClassCheck(PlayerInstance player)
 	{
+		if (Config.DISABLE_TUTORIAL)
+		{
+			return true;
+		}
+		
 		final QuestState qs = player.getQuestState("Q10673_SagaOfLegend");
 		return (qs != null) && qs.isCompleted();
 	}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/SecondClassChange.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/SecondClassChange.java
index 69715e2aeb..846392c475 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/SecondClassChange.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/SecondClassChange.java
@@ -16,7 +16,6 @@
  */
 package ai.others;
 
-import org.l2jmobius.Config;
 import org.l2jmobius.gameserver.data.xml.CategoryData;
 import org.l2jmobius.gameserver.enums.CategoryType;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@@ -40,13 +39,8 @@ public class SecondClassChange extends AbstractNpcAI
 	
 	@RegisterEvent(EventType.ON_PLAYER_LEVEL_CHANGED)
 	@RegisterType(ListenerRegisterType.GLOBAL_PLAYERS)
-	public void OnPlayerLevelChanged(OnPlayerLevelChanged event)
+	public void onPlayerLevelChanged(OnPlayerLevelChanged event)
 	{
-		if (Config.DISABLE_TUTORIAL)
-		{
-			return;
-		}
-		
 		final PlayerInstance player = event.getPlayer();
 		if (player == null)
 		{
@@ -63,13 +57,8 @@ public class SecondClassChange extends AbstractNpcAI
 	
 	@RegisterEvent(EventType.ON_PLAYER_LOGIN)
 	@RegisterType(ListenerRegisterType.GLOBAL_PLAYERS)
-	public void OnPlayerLogin(OnPlayerLogin event)
+	public void onPlayerLogin(OnPlayerLogin event)
 	{
-		if (Config.DISABLE_TUTORIAL)
-		{
-			return;
-		}
-		
 		final PlayerInstance player = event.getPlayer();
 		if (player == null)
 		{
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10673_SagaOfLegend/Q10673_SagaOfLegend.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10673_SagaOfLegend/Q10673_SagaOfLegend.java
index deec66fa80..7c335c1129 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10673_SagaOfLegend/Q10673_SagaOfLegend.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10673_SagaOfLegend/Q10673_SagaOfLegend.java
@@ -260,13 +260,8 @@ public class Q10673_SagaOfLegend extends Quest
 	
 	@RegisterEvent(EventType.ON_PLAYER_LOGIN)
 	@RegisterType(ListenerRegisterType.GLOBAL_PLAYERS)
-	public void OnPlayerLogin(OnPlayerLogin event)
+	public void onPlayerLogin(OnPlayerLogin event)
 	{
-		if (Config.DISABLE_TUTORIAL)
-		{
-			return;
-		}
-		
 		final PlayerInstance player = event.getPlayer();
 		if (player == null)
 		{
@@ -279,7 +274,7 @@ public class Q10673_SagaOfLegend extends Quest
 		}
 		
 		final QuestState qs = getQuestState(player, false);
-		if ((qs != null) && qs.isCompleted())
+		if (Config.DISABLE_TUTORIAL || ((qs != null) && qs.isCompleted()))
 		{
 			player.sendPacket(ExClassChangeSetAlarm.STATIC_PACKET);
 		}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10959_ChallengingYourDestiny/Q10959_ChallengingYourDestiny.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10959_ChallengingYourDestiny/Q10959_ChallengingYourDestiny.java
index d3ca413145..6cad82532f 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10959_ChallengingYourDestiny/Q10959_ChallengingYourDestiny.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10959_ChallengingYourDestiny/Q10959_ChallengingYourDestiny.java
@@ -204,13 +204,8 @@ public class Q10959_ChallengingYourDestiny extends Quest
 	
 	@RegisterEvent(EventType.ON_PLAYER_LOGIN)
 	@RegisterType(ListenerRegisterType.GLOBAL_PLAYERS)
-	public void OnPlayerLogin(OnPlayerLogin event)
+	public void onPlayerLogin(OnPlayerLogin event)
 	{
-		if (Config.DISABLE_TUTORIAL)
-		{
-			return;
-		}
-		
 		final PlayerInstance player = event.getPlayer();
 		if (player == null)
 		{
@@ -229,7 +224,7 @@ public class Q10959_ChallengingYourDestiny extends Quest
 		}
 		
 		final QuestState qs = getQuestState(player, false);
-		if ((qs != null) && qs.isCompleted())
+		if (Config.DISABLE_TUTORIAL || ((qs != null) && qs.isCompleted()))
 		{
 			player.sendPacket(ExClassChangeSetAlarm.STATIC_PACKET);
 		}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10962_NewHorizons/Q10962_NewHorizons.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10962_NewHorizons/Q10962_NewHorizons.java
index fca4a3d548..2346961ac1 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10962_NewHorizons/Q10962_NewHorizons.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10962_NewHorizons/Q10962_NewHorizons.java
@@ -217,13 +217,8 @@ public class Q10962_NewHorizons extends Quest
 	
 	@RegisterEvent(EventType.ON_PLAYER_LOGIN)
 	@RegisterType(ListenerRegisterType.GLOBAL_PLAYERS)
-	public void OnPlayerLogin(OnPlayerLogin event)
+	public void onPlayerLogin(OnPlayerLogin event)
 	{
-		if (Config.DISABLE_TUTORIAL)
-		{
-			return;
-		}
-		
 		final PlayerInstance player = event.getPlayer();
 		if (player == null)
 		{
@@ -242,7 +237,7 @@ public class Q10962_NewHorizons extends Quest
 		}
 		
 		final QuestState qs = getQuestState(player, false);
-		if ((qs != null) && qs.isCompleted())
+		if (Config.DISABLE_TUTORIAL || ((qs != null) && qs.isCompleted()))
 		{
 			player.sendPacket(ExClassChangeSetAlarm.STATIC_PACKET);
 		}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10982_SpiderHunt/Q10982_SpiderHunt.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10982_SpiderHunt/Q10982_SpiderHunt.java
index e3c3f05681..4600842cb5 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10982_SpiderHunt/Q10982_SpiderHunt.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10982_SpiderHunt/Q10982_SpiderHunt.java
@@ -215,13 +215,8 @@ public class Q10982_SpiderHunt extends Quest
 	
 	@RegisterEvent(EventType.ON_PLAYER_LOGIN)
 	@RegisterType(ListenerRegisterType.GLOBAL_PLAYERS)
-	public void OnPlayerLogin(OnPlayerLogin event)
+	public void onPlayerLogin(OnPlayerLogin event)
 	{
-		if (Config.DISABLE_TUTORIAL)
-		{
-			return;
-		}
-		
 		final PlayerInstance player = event.getPlayer();
 		if (player == null)
 		{
@@ -234,7 +229,7 @@ public class Q10982_SpiderHunt extends Quest
 		}
 		
 		final QuestState qs = getQuestState(player, false);
-		if ((qs != null) && qs.isCompleted())
+		if (Config.DISABLE_TUTORIAL || ((qs != null) && qs.isCompleted()))
 		{
 			player.sendPacket(ExClassChangeSetAlarm.STATIC_PACKET);
 		}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10984_CollectSpiderweb/Q10984_CollectSpiderweb.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10984_CollectSpiderweb/Q10984_CollectSpiderweb.java
index 95f56e497a..906bc3b1b4 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10984_CollectSpiderweb/Q10984_CollectSpiderweb.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10984_CollectSpiderweb/Q10984_CollectSpiderweb.java
@@ -194,13 +194,8 @@ public class Q10984_CollectSpiderweb extends Quest
 	
 	@RegisterEvent(EventType.ON_PLAYER_LOGIN)
 	@RegisterType(ListenerRegisterType.GLOBAL_PLAYERS)
-	public void OnPlayerLogin(OnPlayerLogin event)
+	public void onPlayerLogin(OnPlayerLogin event)
 	{
-		if (Config.DISABLE_TUTORIAL)
-		{
-			return;
-		}
-		
 		final PlayerInstance player = event.getPlayer();
 		if (player == null)
 		{
@@ -213,7 +208,7 @@ public class Q10984_CollectSpiderweb extends Quest
 		}
 		
 		final QuestState qs = getQuestState(player, false);
-		if ((qs != null) && qs.isCompleted())
+		if (Config.DISABLE_TUTORIAL || ((qs != null) && qs.isCompleted()))
 		{
 			player.sendPacket(ExClassChangeSetAlarm.STATIC_PACKET);
 		}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10986_SwampMonster/Q10986_SwampMonster.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10986_SwampMonster/Q10986_SwampMonster.java
index 69ef0534cc..1fd5c0d908 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10986_SwampMonster/Q10986_SwampMonster.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10986_SwampMonster/Q10986_SwampMonster.java
@@ -216,13 +216,8 @@ public class Q10986_SwampMonster extends Quest
 	
 	@RegisterEvent(EventType.ON_PLAYER_LOGIN)
 	@RegisterType(ListenerRegisterType.GLOBAL_PLAYERS)
-	public void OnPlayerLogin(OnPlayerLogin event)
+	public void onPlayerLogin(OnPlayerLogin event)
 	{
-		if (Config.DISABLE_TUTORIAL)
-		{
-			return;
-		}
-		
 		final PlayerInstance player = event.getPlayer();
 		if (player == null)
 		{
@@ -235,7 +230,7 @@ public class Q10986_SwampMonster extends Quest
 		}
 		
 		final QuestState qs = getQuestState(player, false);
-		if ((qs != null) && qs.isCompleted())
+		if (Config.DISABLE_TUTORIAL || ((qs != null) && qs.isCompleted()))
 		{
 			player.sendPacket(ExClassChangeSetAlarm.STATIC_PACKET);
 		}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10988_Conspiracy/Q10988_Conspiracy.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10988_Conspiracy/Q10988_Conspiracy.java
index bc0126eaa9..6cc2d31ac8 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10988_Conspiracy/Q10988_Conspiracy.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10988_Conspiracy/Q10988_Conspiracy.java
@@ -216,13 +216,8 @@ public class Q10988_Conspiracy extends Quest
 	
 	@RegisterEvent(EventType.ON_PLAYER_LOGIN)
 	@RegisterType(ListenerRegisterType.GLOBAL_PLAYERS)
-	public void OnPlayerLogin(OnPlayerLogin event)
+	public void onPlayerLogin(OnPlayerLogin event)
 	{
-		if (Config.DISABLE_TUTORIAL)
-		{
-			return;
-		}
-		
 		final PlayerInstance player = event.getPlayer();
 		if (player == null)
 		{
@@ -235,7 +230,7 @@ public class Q10988_Conspiracy extends Quest
 		}
 		
 		final QuestState qs = getQuestState(player, false);
-		if ((qs != null) && qs.isCompleted())
+		if (Config.DISABLE_TUTORIAL || ((qs != null) && qs.isCompleted()))
 		{
 			player.sendPacket(ExClassChangeSetAlarm.STATIC_PACKET);
 		}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10990_PoisonExtraction/Q10990_PoisonExtraction.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10990_PoisonExtraction/Q10990_PoisonExtraction.java
index 7f0088069c..1c929769ca 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10990_PoisonExtraction/Q10990_PoisonExtraction.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10990_PoisonExtraction/Q10990_PoisonExtraction.java
@@ -182,13 +182,8 @@ public class Q10990_PoisonExtraction extends Quest
 	
 	@RegisterEvent(EventType.ON_PLAYER_LOGIN)
 	@RegisterType(ListenerRegisterType.GLOBAL_PLAYERS)
-	public void OnPlayerLogin(OnPlayerLogin event)
+	public void onPlayerLogin(OnPlayerLogin event)
 	{
-		if (Config.DISABLE_TUTORIAL)
-		{
-			return;
-		}
-		
 		final PlayerInstance player = event.getPlayer();
 		if (player == null)
 		{
@@ -201,7 +196,7 @@ public class Q10990_PoisonExtraction extends Quest
 		}
 		
 		final QuestState qs = getQuestState(player, false);
-		if ((qs != null) && qs.isCompleted())
+		if (Config.DISABLE_TUTORIAL || ((qs != null) && qs.isCompleted()))
 		{
 			player.sendPacket(ExClassChangeSetAlarm.STATIC_PACKET);
 		}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/classchange/ExRequestClassChangeVerifying.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/classchange/ExRequestClassChangeVerifying.java
index 745e81824b..448dffee90 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/classchange/ExRequestClassChangeVerifying.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/classchange/ExRequestClassChangeVerifying.java
@@ -42,11 +42,6 @@ public class ExRequestClassChangeVerifying implements IClientIncomingPacket
 	@Override
 	public void run(GameClient client)
 	{
-		if (Config.DISABLE_TUTORIAL)
-		{
-			return;
-		}
-		
 		final PlayerInstance player = client.getPlayer();
 		if (player == null)
 		{
@@ -90,6 +85,11 @@ public class ExRequestClassChangeVerifying implements IClientIncomingPacket
 	
 	private boolean firstClassCheck(PlayerInstance player)
 	{
+		if (Config.DISABLE_TUTORIAL)
+		{
+			return true;
+		}
+		
 		QuestState qs = null;
 		if (player.isDeathKnight())
 		{
@@ -142,6 +142,11 @@ public class ExRequestClassChangeVerifying implements IClientIncomingPacket
 	
 	private boolean thirdClassCheck(PlayerInstance player)
 	{
+		if (Config.DISABLE_TUTORIAL)
+		{
+			return true;
+		}
+		
 		final QuestState qs = player.getQuestState("Q10673_SagaOfLegend");
 		return (qs != null) && qs.isCompleted();
 	}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/SecondClassChange.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/SecondClassChange.java
index 69715e2aeb..846392c475 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/SecondClassChange.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/SecondClassChange.java
@@ -16,7 +16,6 @@
  */
 package ai.others;
 
-import org.l2jmobius.Config;
 import org.l2jmobius.gameserver.data.xml.CategoryData;
 import org.l2jmobius.gameserver.enums.CategoryType;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@@ -40,13 +39,8 @@ public class SecondClassChange extends AbstractNpcAI
 	
 	@RegisterEvent(EventType.ON_PLAYER_LEVEL_CHANGED)
 	@RegisterType(ListenerRegisterType.GLOBAL_PLAYERS)
-	public void OnPlayerLevelChanged(OnPlayerLevelChanged event)
+	public void onPlayerLevelChanged(OnPlayerLevelChanged event)
 	{
-		if (Config.DISABLE_TUTORIAL)
-		{
-			return;
-		}
-		
 		final PlayerInstance player = event.getPlayer();
 		if (player == null)
 		{
@@ -63,13 +57,8 @@ public class SecondClassChange extends AbstractNpcAI
 	
 	@RegisterEvent(EventType.ON_PLAYER_LOGIN)
 	@RegisterType(ListenerRegisterType.GLOBAL_PLAYERS)
-	public void OnPlayerLogin(OnPlayerLogin event)
+	public void onPlayerLogin(OnPlayerLogin event)
 	{
-		if (Config.DISABLE_TUTORIAL)
-		{
-			return;
-		}
-		
 		final PlayerInstance player = event.getPlayer();
 		if (player == null)
 		{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10673_SagaOfLegend/Q10673_SagaOfLegend.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10673_SagaOfLegend/Q10673_SagaOfLegend.java
index ed5243b456..b535e3dcec 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10673_SagaOfLegend/Q10673_SagaOfLegend.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10673_SagaOfLegend/Q10673_SagaOfLegend.java
@@ -244,13 +244,8 @@ public class Q10673_SagaOfLegend extends Quest
 	
 	@RegisterEvent(EventType.ON_PLAYER_LOGIN)
 	@RegisterType(ListenerRegisterType.GLOBAL_PLAYERS)
-	public void OnPlayerLogin(OnPlayerLogin event)
+	public void onPlayerLogin(OnPlayerLogin event)
 	{
-		if (Config.DISABLE_TUTORIAL)
-		{
-			return;
-		}
-		
 		final PlayerInstance player = event.getPlayer();
 		if (player == null)
 		{
@@ -263,7 +258,7 @@ public class Q10673_SagaOfLegend extends Quest
 		}
 		
 		final QuestState qs = getQuestState(player, false);
-		if ((qs != null) && qs.isCompleted())
+		if (Config.DISABLE_TUTORIAL || ((qs != null) && qs.isCompleted()))
 		{
 			player.sendPacket(ExClassChangeSetAlarm.STATIC_PACKET);
 		}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10956_WeSylphs/Q10956_WeSylphs.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10956_WeSylphs/Q10956_WeSylphs.java
index 8c7abe71fa..340b8bec0e 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10956_WeSylphs/Q10956_WeSylphs.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10956_WeSylphs/Q10956_WeSylphs.java
@@ -221,13 +221,8 @@ public class Q10956_WeSylphs extends Quest
 	
 	@RegisterEvent(EventType.ON_PLAYER_LOGIN)
 	@RegisterType(ListenerRegisterType.GLOBAL_PLAYERS)
-	public void OnPlayerLogin(OnPlayerLogin event)
+	public void onPlayerLogin(OnPlayerLogin event)
 	{
-		if (Config.DISABLE_TUTORIAL)
-		{
-			return;
-		}
-		
 		final PlayerInstance player = event.getPlayer();
 		if (player == null)
 		{
@@ -240,7 +235,7 @@ public class Q10956_WeSylphs extends Quest
 		}
 		
 		final QuestState qs = getQuestState(player, false);
-		if ((qs != null) && qs.isCompleted())
+		if (Config.DISABLE_TUTORIAL || ((qs != null) && qs.isCompleted()))
 		{
 			player.sendPacket(ExClassChangeSetAlarm.STATIC_PACKET);
 		}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10959_ChallengingYourDestiny/Q10959_ChallengingYourDestiny.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10959_ChallengingYourDestiny/Q10959_ChallengingYourDestiny.java
index ff6c204754..798d9384ee 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10959_ChallengingYourDestiny/Q10959_ChallengingYourDestiny.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10959_ChallengingYourDestiny/Q10959_ChallengingYourDestiny.java
@@ -204,13 +204,8 @@ public class Q10959_ChallengingYourDestiny extends Quest
 	
 	@RegisterEvent(EventType.ON_PLAYER_LOGIN)
 	@RegisterType(ListenerRegisterType.GLOBAL_PLAYERS)
-	public void OnPlayerLogin(OnPlayerLogin event)
+	public void onPlayerLogin(OnPlayerLogin event)
 	{
-		if (Config.DISABLE_TUTORIAL)
-		{
-			return;
-		}
-		
 		final PlayerInstance player = event.getPlayer();
 		if (player == null)
 		{
@@ -229,7 +224,7 @@ public class Q10959_ChallengingYourDestiny extends Quest
 		}
 		
 		final QuestState qs = getQuestState(player, false);
-		if ((qs != null) && qs.isCompleted())
+		if (Config.DISABLE_TUTORIAL || ((qs != null) && qs.isCompleted()))
 		{
 			player.sendPacket(ExClassChangeSetAlarm.STATIC_PACKET);
 		}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10962_NewHorizons/Q10962_NewHorizons.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10962_NewHorizons/Q10962_NewHorizons.java
index fca4a3d548..2346961ac1 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10962_NewHorizons/Q10962_NewHorizons.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10962_NewHorizons/Q10962_NewHorizons.java
@@ -217,13 +217,8 @@ public class Q10962_NewHorizons extends Quest
 	
 	@RegisterEvent(EventType.ON_PLAYER_LOGIN)
 	@RegisterType(ListenerRegisterType.GLOBAL_PLAYERS)
-	public void OnPlayerLogin(OnPlayerLogin event)
+	public void onPlayerLogin(OnPlayerLogin event)
 	{
-		if (Config.DISABLE_TUTORIAL)
-		{
-			return;
-		}
-		
 		final PlayerInstance player = event.getPlayer();
 		if (player == null)
 		{
@@ -242,7 +237,7 @@ public class Q10962_NewHorizons extends Quest
 		}
 		
 		final QuestState qs = getQuestState(player, false);
-		if ((qs != null) && qs.isCompleted())
+		if (Config.DISABLE_TUTORIAL || ((qs != null) && qs.isCompleted()))
 		{
 			player.sendPacket(ExClassChangeSetAlarm.STATIC_PACKET);
 		}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10982_SpiderHunt/Q10982_SpiderHunt.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10982_SpiderHunt/Q10982_SpiderHunt.java
index e3c3f05681..4600842cb5 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10982_SpiderHunt/Q10982_SpiderHunt.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10982_SpiderHunt/Q10982_SpiderHunt.java
@@ -215,13 +215,8 @@ public class Q10982_SpiderHunt extends Quest
 	
 	@RegisterEvent(EventType.ON_PLAYER_LOGIN)
 	@RegisterType(ListenerRegisterType.GLOBAL_PLAYERS)
-	public void OnPlayerLogin(OnPlayerLogin event)
+	public void onPlayerLogin(OnPlayerLogin event)
 	{
-		if (Config.DISABLE_TUTORIAL)
-		{
-			return;
-		}
-		
 		final PlayerInstance player = event.getPlayer();
 		if (player == null)
 		{
@@ -234,7 +229,7 @@ public class Q10982_SpiderHunt extends Quest
 		}
 		
 		final QuestState qs = getQuestState(player, false);
-		if ((qs != null) && qs.isCompleted())
+		if (Config.DISABLE_TUTORIAL || ((qs != null) && qs.isCompleted()))
 		{
 			player.sendPacket(ExClassChangeSetAlarm.STATIC_PACKET);
 		}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10984_CollectSpiderweb/Q10984_CollectSpiderweb.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10984_CollectSpiderweb/Q10984_CollectSpiderweb.java
index 95f56e497a..906bc3b1b4 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10984_CollectSpiderweb/Q10984_CollectSpiderweb.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10984_CollectSpiderweb/Q10984_CollectSpiderweb.java
@@ -194,13 +194,8 @@ public class Q10984_CollectSpiderweb extends Quest
 	
 	@RegisterEvent(EventType.ON_PLAYER_LOGIN)
 	@RegisterType(ListenerRegisterType.GLOBAL_PLAYERS)
-	public void OnPlayerLogin(OnPlayerLogin event)
+	public void onPlayerLogin(OnPlayerLogin event)
 	{
-		if (Config.DISABLE_TUTORIAL)
-		{
-			return;
-		}
-		
 		final PlayerInstance player = event.getPlayer();
 		if (player == null)
 		{
@@ -213,7 +208,7 @@ public class Q10984_CollectSpiderweb extends Quest
 		}
 		
 		final QuestState qs = getQuestState(player, false);
-		if ((qs != null) && qs.isCompleted())
+		if (Config.DISABLE_TUTORIAL || ((qs != null) && qs.isCompleted()))
 		{
 			player.sendPacket(ExClassChangeSetAlarm.STATIC_PACKET);
 		}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10986_SwampMonster/Q10986_SwampMonster.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10986_SwampMonster/Q10986_SwampMonster.java
index 69ef0534cc..1fd5c0d908 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10986_SwampMonster/Q10986_SwampMonster.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10986_SwampMonster/Q10986_SwampMonster.java
@@ -216,13 +216,8 @@ public class Q10986_SwampMonster extends Quest
 	
 	@RegisterEvent(EventType.ON_PLAYER_LOGIN)
 	@RegisterType(ListenerRegisterType.GLOBAL_PLAYERS)
-	public void OnPlayerLogin(OnPlayerLogin event)
+	public void onPlayerLogin(OnPlayerLogin event)
 	{
-		if (Config.DISABLE_TUTORIAL)
-		{
-			return;
-		}
-		
 		final PlayerInstance player = event.getPlayer();
 		if (player == null)
 		{
@@ -235,7 +230,7 @@ public class Q10986_SwampMonster extends Quest
 		}
 		
 		final QuestState qs = getQuestState(player, false);
-		if ((qs != null) && qs.isCompleted())
+		if (Config.DISABLE_TUTORIAL || ((qs != null) && qs.isCompleted()))
 		{
 			player.sendPacket(ExClassChangeSetAlarm.STATIC_PACKET);
 		}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10988_Conspiracy/Q10988_Conspiracy.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10988_Conspiracy/Q10988_Conspiracy.java
index bc0126eaa9..6cc2d31ac8 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10988_Conspiracy/Q10988_Conspiracy.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10988_Conspiracy/Q10988_Conspiracy.java
@@ -216,13 +216,8 @@ public class Q10988_Conspiracy extends Quest
 	
 	@RegisterEvent(EventType.ON_PLAYER_LOGIN)
 	@RegisterType(ListenerRegisterType.GLOBAL_PLAYERS)
-	public void OnPlayerLogin(OnPlayerLogin event)
+	public void onPlayerLogin(OnPlayerLogin event)
 	{
-		if (Config.DISABLE_TUTORIAL)
-		{
-			return;
-		}
-		
 		final PlayerInstance player = event.getPlayer();
 		if (player == null)
 		{
@@ -235,7 +230,7 @@ public class Q10988_Conspiracy extends Quest
 		}
 		
 		final QuestState qs = getQuestState(player, false);
-		if ((qs != null) && qs.isCompleted())
+		if (Config.DISABLE_TUTORIAL || ((qs != null) && qs.isCompleted()))
 		{
 			player.sendPacket(ExClassChangeSetAlarm.STATIC_PACKET);
 		}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10990_PoisonExtraction/Q10990_PoisonExtraction.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10990_PoisonExtraction/Q10990_PoisonExtraction.java
index 7f0088069c..1c929769ca 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10990_PoisonExtraction/Q10990_PoisonExtraction.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10990_PoisonExtraction/Q10990_PoisonExtraction.java
@@ -182,13 +182,8 @@ public class Q10990_PoisonExtraction extends Quest
 	
 	@RegisterEvent(EventType.ON_PLAYER_LOGIN)
 	@RegisterType(ListenerRegisterType.GLOBAL_PLAYERS)
-	public void OnPlayerLogin(OnPlayerLogin event)
+	public void onPlayerLogin(OnPlayerLogin event)
 	{
-		if (Config.DISABLE_TUTORIAL)
-		{
-			return;
-		}
-		
 		final PlayerInstance player = event.getPlayer();
 		if (player == null)
 		{
@@ -201,7 +196,7 @@ public class Q10990_PoisonExtraction extends Quest
 		}
 		
 		final QuestState qs = getQuestState(player, false);
-		if ((qs != null) && qs.isCompleted())
+		if (Config.DISABLE_TUTORIAL || ((qs != null) && qs.isCompleted()))
 		{
 			player.sendPacket(ExClassChangeSetAlarm.STATIC_PACKET);
 		}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/classchange/ExRequestClassChangeVerifying.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/classchange/ExRequestClassChangeVerifying.java
index c057529f01..7795120211 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/classchange/ExRequestClassChangeVerifying.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/classchange/ExRequestClassChangeVerifying.java
@@ -16,6 +16,7 @@
  */
 package org.l2jmobius.gameserver.network.clientpackets.classchange;
 
+import org.l2jmobius.Config;
 import org.l2jmobius.commons.network.PacketReader;
 import org.l2jmobius.gameserver.enums.CategoryType;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@@ -84,6 +85,11 @@ public class ExRequestClassChangeVerifying implements IClientIncomingPacket
 	
 	private boolean firstClassCheck(PlayerInstance player)
 	{
+		if (Config.DISABLE_TUTORIAL)
+		{
+			return true;
+		}
+		
 		QuestState qs = null;
 		if (player.isDeathKnight())
 		{
@@ -141,6 +147,11 @@ public class ExRequestClassChangeVerifying implements IClientIncomingPacket
 	
 	private boolean thirdClassCheck(PlayerInstance player)
 	{
+		if (Config.DISABLE_TUTORIAL)
+		{
+			return true;
+		}
+		
 		final QuestState qs = player.getQuestState("Q10673_SagaOfLegend");
 		return (qs != null) && qs.isCompleted();
 	}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/ai/others/SecondClassChange.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/ai/others/SecondClassChange.java
index 69715e2aeb..846392c475 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/ai/others/SecondClassChange.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/ai/others/SecondClassChange.java
@@ -16,7 +16,6 @@
  */
 package ai.others;
 
-import org.l2jmobius.Config;
 import org.l2jmobius.gameserver.data.xml.CategoryData;
 import org.l2jmobius.gameserver.enums.CategoryType;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@@ -40,13 +39,8 @@ public class SecondClassChange extends AbstractNpcAI
 	
 	@RegisterEvent(EventType.ON_PLAYER_LEVEL_CHANGED)
 	@RegisterType(ListenerRegisterType.GLOBAL_PLAYERS)
-	public void OnPlayerLevelChanged(OnPlayerLevelChanged event)
+	public void onPlayerLevelChanged(OnPlayerLevelChanged event)
 	{
-		if (Config.DISABLE_TUTORIAL)
-		{
-			return;
-		}
-		
 		final PlayerInstance player = event.getPlayer();
 		if (player == null)
 		{
@@ -63,13 +57,8 @@ public class SecondClassChange extends AbstractNpcAI
 	
 	@RegisterEvent(EventType.ON_PLAYER_LOGIN)
 	@RegisterType(ListenerRegisterType.GLOBAL_PLAYERS)
-	public void OnPlayerLogin(OnPlayerLogin event)
+	public void onPlayerLogin(OnPlayerLogin event)
 	{
-		if (Config.DISABLE_TUTORIAL)
-		{
-			return;
-		}
-		
 		final PlayerInstance player = event.getPlayer();
 		if (player == null)
 		{
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/quests/Q10673_SagaOfLegend/Q10673_SagaOfLegend.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/quests/Q10673_SagaOfLegend/Q10673_SagaOfLegend.java
index ed5243b456..b535e3dcec 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/quests/Q10673_SagaOfLegend/Q10673_SagaOfLegend.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/quests/Q10673_SagaOfLegend/Q10673_SagaOfLegend.java
@@ -244,13 +244,8 @@ public class Q10673_SagaOfLegend extends Quest
 	
 	@RegisterEvent(EventType.ON_PLAYER_LOGIN)
 	@RegisterType(ListenerRegisterType.GLOBAL_PLAYERS)
-	public void OnPlayerLogin(OnPlayerLogin event)
+	public void onPlayerLogin(OnPlayerLogin event)
 	{
-		if (Config.DISABLE_TUTORIAL)
-		{
-			return;
-		}
-		
 		final PlayerInstance player = event.getPlayer();
 		if (player == null)
 		{
@@ -263,7 +258,7 @@ public class Q10673_SagaOfLegend extends Quest
 		}
 		
 		final QuestState qs = getQuestState(player, false);
-		if ((qs != null) && qs.isCompleted())
+		if (Config.DISABLE_TUTORIAL || ((qs != null) && qs.isCompleted()))
 		{
 			player.sendPacket(ExClassChangeSetAlarm.STATIC_PACKET);
 		}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/quests/Q10956_WeSylphs/Q10956_WeSylphs.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/quests/Q10956_WeSylphs/Q10956_WeSylphs.java
index 8c7abe71fa..340b8bec0e 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/quests/Q10956_WeSylphs/Q10956_WeSylphs.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/quests/Q10956_WeSylphs/Q10956_WeSylphs.java
@@ -221,13 +221,8 @@ public class Q10956_WeSylphs extends Quest
 	
 	@RegisterEvent(EventType.ON_PLAYER_LOGIN)
 	@RegisterType(ListenerRegisterType.GLOBAL_PLAYERS)
-	public void OnPlayerLogin(OnPlayerLogin event)
+	public void onPlayerLogin(OnPlayerLogin event)
 	{
-		if (Config.DISABLE_TUTORIAL)
-		{
-			return;
-		}
-		
 		final PlayerInstance player = event.getPlayer();
 		if (player == null)
 		{
@@ -240,7 +235,7 @@ public class Q10956_WeSylphs extends Quest
 		}
 		
 		final QuestState qs = getQuestState(player, false);
-		if ((qs != null) && qs.isCompleted())
+		if (Config.DISABLE_TUTORIAL || ((qs != null) && qs.isCompleted()))
 		{
 			player.sendPacket(ExClassChangeSetAlarm.STATIC_PACKET);
 		}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/quests/Q10959_ChallengingYourDestiny/Q10959_ChallengingYourDestiny.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/quests/Q10959_ChallengingYourDestiny/Q10959_ChallengingYourDestiny.java
index ff6c204754..798d9384ee 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/quests/Q10959_ChallengingYourDestiny/Q10959_ChallengingYourDestiny.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/quests/Q10959_ChallengingYourDestiny/Q10959_ChallengingYourDestiny.java
@@ -204,13 +204,8 @@ public class Q10959_ChallengingYourDestiny extends Quest
 	
 	@RegisterEvent(EventType.ON_PLAYER_LOGIN)
 	@RegisterType(ListenerRegisterType.GLOBAL_PLAYERS)
-	public void OnPlayerLogin(OnPlayerLogin event)
+	public void onPlayerLogin(OnPlayerLogin event)
 	{
-		if (Config.DISABLE_TUTORIAL)
-		{
-			return;
-		}
-		
 		final PlayerInstance player = event.getPlayer();
 		if (player == null)
 		{
@@ -229,7 +224,7 @@ public class Q10959_ChallengingYourDestiny extends Quest
 		}
 		
 		final QuestState qs = getQuestState(player, false);
-		if ((qs != null) && qs.isCompleted())
+		if (Config.DISABLE_TUTORIAL || ((qs != null) && qs.isCompleted()))
 		{
 			player.sendPacket(ExClassChangeSetAlarm.STATIC_PACKET);
 		}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/quests/Q10962_NewHorizons/Q10962_NewHorizons.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/quests/Q10962_NewHorizons/Q10962_NewHorizons.java
index fca4a3d548..2346961ac1 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/quests/Q10962_NewHorizons/Q10962_NewHorizons.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/quests/Q10962_NewHorizons/Q10962_NewHorizons.java
@@ -217,13 +217,8 @@ public class Q10962_NewHorizons extends Quest
 	
 	@RegisterEvent(EventType.ON_PLAYER_LOGIN)
 	@RegisterType(ListenerRegisterType.GLOBAL_PLAYERS)
-	public void OnPlayerLogin(OnPlayerLogin event)
+	public void onPlayerLogin(OnPlayerLogin event)
 	{
-		if (Config.DISABLE_TUTORIAL)
-		{
-			return;
-		}
-		
 		final PlayerInstance player = event.getPlayer();
 		if (player == null)
 		{
@@ -242,7 +237,7 @@ public class Q10962_NewHorizons extends Quest
 		}
 		
 		final QuestState qs = getQuestState(player, false);
-		if ((qs != null) && qs.isCompleted())
+		if (Config.DISABLE_TUTORIAL || ((qs != null) && qs.isCompleted()))
 		{
 			player.sendPacket(ExClassChangeSetAlarm.STATIC_PACKET);
 		}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/quests/Q10982_SpiderHunt/Q10982_SpiderHunt.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/quests/Q10982_SpiderHunt/Q10982_SpiderHunt.java
index e3c3f05681..4600842cb5 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/quests/Q10982_SpiderHunt/Q10982_SpiderHunt.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/quests/Q10982_SpiderHunt/Q10982_SpiderHunt.java
@@ -215,13 +215,8 @@ public class Q10982_SpiderHunt extends Quest
 	
 	@RegisterEvent(EventType.ON_PLAYER_LOGIN)
 	@RegisterType(ListenerRegisterType.GLOBAL_PLAYERS)
-	public void OnPlayerLogin(OnPlayerLogin event)
+	public void onPlayerLogin(OnPlayerLogin event)
 	{
-		if (Config.DISABLE_TUTORIAL)
-		{
-			return;
-		}
-		
 		final PlayerInstance player = event.getPlayer();
 		if (player == null)
 		{
@@ -234,7 +229,7 @@ public class Q10982_SpiderHunt extends Quest
 		}
 		
 		final QuestState qs = getQuestState(player, false);
-		if ((qs != null) && qs.isCompleted())
+		if (Config.DISABLE_TUTORIAL || ((qs != null) && qs.isCompleted()))
 		{
 			player.sendPacket(ExClassChangeSetAlarm.STATIC_PACKET);
 		}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/quests/Q10984_CollectSpiderweb/Q10984_CollectSpiderweb.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/quests/Q10984_CollectSpiderweb/Q10984_CollectSpiderweb.java
index 95f56e497a..906bc3b1b4 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/quests/Q10984_CollectSpiderweb/Q10984_CollectSpiderweb.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/quests/Q10984_CollectSpiderweb/Q10984_CollectSpiderweb.java
@@ -194,13 +194,8 @@ public class Q10984_CollectSpiderweb extends Quest
 	
 	@RegisterEvent(EventType.ON_PLAYER_LOGIN)
 	@RegisterType(ListenerRegisterType.GLOBAL_PLAYERS)
-	public void OnPlayerLogin(OnPlayerLogin event)
+	public void onPlayerLogin(OnPlayerLogin event)
 	{
-		if (Config.DISABLE_TUTORIAL)
-		{
-			return;
-		}
-		
 		final PlayerInstance player = event.getPlayer();
 		if (player == null)
 		{
@@ -213,7 +208,7 @@ public class Q10984_CollectSpiderweb extends Quest
 		}
 		
 		final QuestState qs = getQuestState(player, false);
-		if ((qs != null) && qs.isCompleted())
+		if (Config.DISABLE_TUTORIAL || ((qs != null) && qs.isCompleted()))
 		{
 			player.sendPacket(ExClassChangeSetAlarm.STATIC_PACKET);
 		}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/quests/Q10986_SwampMonster/Q10986_SwampMonster.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/quests/Q10986_SwampMonster/Q10986_SwampMonster.java
index 69ef0534cc..1fd5c0d908 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/quests/Q10986_SwampMonster/Q10986_SwampMonster.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/quests/Q10986_SwampMonster/Q10986_SwampMonster.java
@@ -216,13 +216,8 @@ public class Q10986_SwampMonster extends Quest
 	
 	@RegisterEvent(EventType.ON_PLAYER_LOGIN)
 	@RegisterType(ListenerRegisterType.GLOBAL_PLAYERS)
-	public void OnPlayerLogin(OnPlayerLogin event)
+	public void onPlayerLogin(OnPlayerLogin event)
 	{
-		if (Config.DISABLE_TUTORIAL)
-		{
-			return;
-		}
-		
 		final PlayerInstance player = event.getPlayer();
 		if (player == null)
 		{
@@ -235,7 +230,7 @@ public class Q10986_SwampMonster extends Quest
 		}
 		
 		final QuestState qs = getQuestState(player, false);
-		if ((qs != null) && qs.isCompleted())
+		if (Config.DISABLE_TUTORIAL || ((qs != null) && qs.isCompleted()))
 		{
 			player.sendPacket(ExClassChangeSetAlarm.STATIC_PACKET);
 		}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/quests/Q10988_Conspiracy/Q10988_Conspiracy.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/quests/Q10988_Conspiracy/Q10988_Conspiracy.java
index bc0126eaa9..6cc2d31ac8 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/quests/Q10988_Conspiracy/Q10988_Conspiracy.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/quests/Q10988_Conspiracy/Q10988_Conspiracy.java
@@ -216,13 +216,8 @@ public class Q10988_Conspiracy extends Quest
 	
 	@RegisterEvent(EventType.ON_PLAYER_LOGIN)
 	@RegisterType(ListenerRegisterType.GLOBAL_PLAYERS)
-	public void OnPlayerLogin(OnPlayerLogin event)
+	public void onPlayerLogin(OnPlayerLogin event)
 	{
-		if (Config.DISABLE_TUTORIAL)
-		{
-			return;
-		}
-		
 		final PlayerInstance player = event.getPlayer();
 		if (player == null)
 		{
@@ -235,7 +230,7 @@ public class Q10988_Conspiracy extends Quest
 		}
 		
 		final QuestState qs = getQuestState(player, false);
-		if ((qs != null) && qs.isCompleted())
+		if (Config.DISABLE_TUTORIAL || ((qs != null) && qs.isCompleted()))
 		{
 			player.sendPacket(ExClassChangeSetAlarm.STATIC_PACKET);
 		}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/quests/Q10990_PoisonExtraction/Q10990_PoisonExtraction.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/quests/Q10990_PoisonExtraction/Q10990_PoisonExtraction.java
index 7f0088069c..1c929769ca 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/quests/Q10990_PoisonExtraction/Q10990_PoisonExtraction.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/quests/Q10990_PoisonExtraction/Q10990_PoisonExtraction.java
@@ -182,13 +182,8 @@ public class Q10990_PoisonExtraction extends Quest
 	
 	@RegisterEvent(EventType.ON_PLAYER_LOGIN)
 	@RegisterType(ListenerRegisterType.GLOBAL_PLAYERS)
-	public void OnPlayerLogin(OnPlayerLogin event)
+	public void onPlayerLogin(OnPlayerLogin event)
 	{
-		if (Config.DISABLE_TUTORIAL)
-		{
-			return;
-		}
-		
 		final PlayerInstance player = event.getPlayer();
 		if (player == null)
 		{
@@ -201,7 +196,7 @@ public class Q10990_PoisonExtraction extends Quest
 		}
 		
 		final QuestState qs = getQuestState(player, false);
-		if ((qs != null) && qs.isCompleted())
+		if (Config.DISABLE_TUTORIAL || ((qs != null) && qs.isCompleted()))
 		{
 			player.sendPacket(ExClassChangeSetAlarm.STATIC_PACKET);
 		}