diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/quests/Q10995_MutualBenefit/Q10995_MutualBenefit.java b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/quests/Q10995_MutualBenefit/Q10995_MutualBenefit.java
index 56bb1f00ce..4c79788599 100644
--- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/quests/Q10995_MutualBenefit/Q10995_MutualBenefit.java
+++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/quests/Q10995_MutualBenefit/Q10995_MutualBenefit.java
@@ -219,7 +219,10 @@ public class Q10995_MutualBenefit extends Quest
 		{
 			case State.CREATED:
 			{
-				htmltext = "30601-01.html";
+				if (npc.getId() == NEWBIE_GUIDE)
+				{
+					htmltext = "30601-01.html";
+				}
 				break;
 			}
 			case State.STARTED:
@@ -262,6 +265,11 @@ public class Q10995_MutualBenefit extends Quest
 				}
 				break;
 			}
+			case State.COMPLETED:
+			{
+				htmltext = getAlreadyCompletedMsg(talker);
+				break;
+			}
 		}
 		return htmltext;
 	}
diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/quests/Q11001_TombsOfAncestors/Q11001_TombsOfAncestors.java b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/quests/Q11001_TombsOfAncestors/Q11001_TombsOfAncestors.java
index 01aac0c035..05f477081b 100644
--- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/quests/Q11001_TombsOfAncestors/Q11001_TombsOfAncestors.java
+++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/quests/Q11001_TombsOfAncestors/Q11001_TombsOfAncestors.java
@@ -134,7 +134,10 @@ public class Q11001_TombsOfAncestors extends Quest
 		{
 			case State.CREATED:
 			{
-				htmltext = "30598-01.html";
+				if (npc.getId() == NEWBIE_GUIDE)
+				{
+					htmltext = "30598-01.html";
+				}
 				break;
 			}
 			case State.STARTED:
@@ -173,6 +176,11 @@ public class Q11001_TombsOfAncestors extends Quest
 				}
 				break;
 			}
+			case State.COMPLETED:
+			{
+				htmltext = getAlreadyCompletedMsg(talker);
+				break;
+			}
 		}
 		return htmltext;
 	}
diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/quests/Q11002_HelpWithTempleRestoration/Q11002_HelpWithTempleRestoration.java b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/quests/Q11002_HelpWithTempleRestoration/Q11002_HelpWithTempleRestoration.java
index 74793140c6..ea1efa0b56 100644
--- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/quests/Q11002_HelpWithTempleRestoration/Q11002_HelpWithTempleRestoration.java
+++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/quests/Q11002_HelpWithTempleRestoration/Q11002_HelpWithTempleRestoration.java
@@ -133,7 +133,10 @@ public class Q11002_HelpWithTempleRestoration extends Quest
 		{
 			case State.CREATED:
 			{
-				htmltext = "30283-01.html";
+				if (npc.getId() == ALTRAN)
+				{
+					htmltext = "30283-01.html";
+				}
 				break;
 			}
 			case State.STARTED:
@@ -172,6 +175,11 @@ public class Q11002_HelpWithTempleRestoration extends Quest
 				}
 				break;
 			}
+			case State.COMPLETED:
+			{
+				htmltext = getAlreadyCompletedMsg(talker);
+				break;
+			}
 		}
 		return htmltext;
 	}
diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/quests/Q11007_NoiseInWoods/Q11007_NoiseInWoods.java b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/quests/Q11007_NoiseInWoods/Q11007_NoiseInWoods.java
index 94ac680ebb..d7e4f82fdd 100644
--- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/quests/Q11007_NoiseInWoods/Q11007_NoiseInWoods.java
+++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/quests/Q11007_NoiseInWoods/Q11007_NoiseInWoods.java
@@ -207,7 +207,10 @@ public class Q11007_NoiseInWoods extends Quest
 		{
 			case State.CREATED:
 			{
-				htmltext = "30599-01.html";
+				if (npc.getId() == NEWBIE_GUIDE)
+				{
+					htmltext = "30599-01.html";
+				}
 				break;
 			}
 			case State.STARTED:
@@ -250,6 +253,11 @@ public class Q11007_NoiseInWoods extends Quest
 				}
 				break;
 			}
+			case State.COMPLETED:
+			{
+				htmltext = getAlreadyCompletedMsg(talker);
+				break;
+			}
 		}
 		return htmltext;
 	}
diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/quests/Q11013_ShilensHunt/Q11013_ShilensHunt.java b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/quests/Q11013_ShilensHunt/Q11013_ShilensHunt.java
index ca3261d046..5f124c2ff0 100644
--- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/quests/Q11013_ShilensHunt/Q11013_ShilensHunt.java
+++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/quests/Q11013_ShilensHunt/Q11013_ShilensHunt.java
@@ -140,7 +140,10 @@ public class Q11013_ShilensHunt extends Quest
 		{
 			case State.CREATED:
 			{
-				htmltext = "30600-01.html";
+				if (npc.getId() == NEWBIE_GUIDE)
+				{
+					htmltext = "30600-01.html";
+				}
 				break;
 			}
 			case State.STARTED:
@@ -179,6 +182,11 @@ public class Q11013_ShilensHunt extends Quest
 				}
 				break;
 			}
+			case State.COMPLETED:
+			{
+				htmltext = getAlreadyCompletedMsg(talker);
+				break;
+			}
 		}
 		return htmltext;
 	}
diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/quests/Q11019_TribalBenefit/Q11019_TribalBenefit.java b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/quests/Q11019_TribalBenefit/Q11019_TribalBenefit.java
index 61e52cfa76..814544363c 100644
--- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/quests/Q11019_TribalBenefit/Q11019_TribalBenefit.java
+++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/quests/Q11019_TribalBenefit/Q11019_TribalBenefit.java
@@ -218,7 +218,10 @@ public class Q11019_TribalBenefit extends Quest
 		{
 			case State.CREATED:
 			{
-				htmltext = "30602-01.html";
+				if (npc.getId() == NEWBIE_GUIDE)
+				{
+					htmltext = "30602-01.html";
+				}
 				break;
 			}
 			case State.STARTED:
@@ -261,6 +264,11 @@ public class Q11019_TribalBenefit extends Quest
 				}
 				break;
 			}
+			case State.COMPLETED:
+			{
+				htmltext = getAlreadyCompletedMsg(talker);
+				break;
+			}
 		}
 		return htmltext;
 	}