diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java
index 4fe1edd1b7..f8ccf55310 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java
@@ -195,6 +195,11 @@ public class OlympiadManager
 			return false;
 		}
 		
+		if (isRegistered(player, player, true) || isInCompetition(player, player, true))
+		{
+			return false;
+		}
+		
 		StatSet statDat = Olympiad.getNobleStats(charId);
 		if (statDat == null)
 		{
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java
index 12a077b8ea..384cfdc627 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java
@@ -195,6 +195,11 @@ public class OlympiadManager
 			return false;
 		}
 		
+		if (isRegistered(player, player, true) || isInCompetition(player, player, true))
+		{
+			return false;
+		}
+		
 		StatSet statDat = Olympiad.getNobleStats(charId);
 		if (statDat == null)
 		{
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java
index 12a077b8ea..384cfdc627 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java
@@ -195,6 +195,11 @@ public class OlympiadManager
 			return false;
 		}
 		
+		if (isRegistered(player, player, true) || isInCompetition(player, player, true))
+		{
+			return false;
+		}
+		
 		StatSet statDat = Olympiad.getNobleStats(charId);
 		if (statDat == null)
 		{
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java
index bb7c8d5bbc..5bcbd9deb4 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java
@@ -195,6 +195,11 @@ public class OlympiadManager
 			return false;
 		}
 		
+		if (isRegistered(player, player, true) || isInCompetition(player, player, true))
+		{
+			return false;
+		}
+		
 		StatSet statDat = Olympiad.getNobleStats(charId);
 		if (statDat == null)
 		{
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java
index bb7c8d5bbc..5bcbd9deb4 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java
@@ -195,6 +195,11 @@ public class OlympiadManager
 			return false;
 		}
 		
+		if (isRegistered(player, player, true) || isInCompetition(player, player, true))
+		{
+			return false;
+		}
+		
 		StatSet statDat = Olympiad.getNobleStats(charId);
 		if (statDat == null)
 		{
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java
index bbcf3200dd..33b6e3c5ee 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java
@@ -195,6 +195,11 @@ public class OlympiadManager
 			return false;
 		}
 		
+		if (isRegistered(player, player, true) || isInCompetition(player, player, true))
+		{
+			return false;
+		}
+		
 		StatSet statDat = Olympiad.getNobleStats(charId);
 		if (statDat == null)
 		{
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java
index bbcf3200dd..33b6e3c5ee 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java
@@ -195,6 +195,11 @@ public class OlympiadManager
 			return false;
 		}
 		
+		if (isRegistered(player, player, true) || isInCompetition(player, player, true))
+		{
+			return false;
+		}
+		
 		StatSet statDat = Olympiad.getNobleStats(charId);
 		if (statDat == null)
 		{
diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java
index 46f6ab3b46..15c1a36157 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java
@@ -195,6 +195,11 @@ public class OlympiadManager
 			return false;
 		}
 		
+		if (isRegistered(player, player, true) || isInCompetition(player, player, true))
+		{
+			return false;
+		}
+		
 		StatSet statDat = Olympiad.getNobleStats(charId);
 		if (statDat == null)
 		{
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java
index 1c98c7a05b..5e55ac0979 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java
@@ -195,6 +195,11 @@ public class OlympiadManager
 			return false;
 		}
 		
+		if (isRegistered(player, player, true) || isInCompetition(player, player, true))
+		{
+			return false;
+		}
+		
 		StatSet statDat = Olympiad.getNobleStats(charId);
 		if (statDat == null)
 		{
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java
index 1c98c7a05b..5e55ac0979 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java
@@ -195,6 +195,11 @@ public class OlympiadManager
 			return false;
 		}
 		
+		if (isRegistered(player, player, true) || isInCompetition(player, player, true))
+		{
+			return false;
+		}
+		
 		StatSet statDat = Olympiad.getNobleStats(charId);
 		if (statDat == null)
 		{
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java
index 1c98c7a05b..5e55ac0979 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java
@@ -195,6 +195,11 @@ public class OlympiadManager
 			return false;
 		}
 		
+		if (isRegistered(player, player, true) || isInCompetition(player, player, true))
+		{
+			return false;
+		}
+		
 		StatSet statDat = Olympiad.getNobleStats(charId);
 		if (statDat == null)
 		{
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java
index 1c98c7a05b..5e55ac0979 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java
@@ -195,6 +195,11 @@ public class OlympiadManager
 			return false;
 		}
 		
+		if (isRegistered(player, player, true) || isInCompetition(player, player, true))
+		{
+			return false;
+		}
+		
 		StatSet statDat = Olympiad.getNobleStats(charId);
 		if (statDat == null)
 		{
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java
index 1c98c7a05b..5e55ac0979 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java
@@ -195,6 +195,11 @@ public class OlympiadManager
 			return false;
 		}
 		
+		if (isRegistered(player, player, true) || isInCompetition(player, player, true))
+		{
+			return false;
+		}
+		
 		StatSet statDat = Olympiad.getNobleStats(charId);
 		if (statDat == null)
 		{
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java
index 0220b42360..f56e72282c 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java
@@ -195,6 +195,11 @@ public class OlympiadManager
 			return false;
 		}
 		
+		if (isRegistered(player, player, true) || isInCompetition(player, player, true))
+		{
+			return false;
+		}
+		
 		StatSet statDat = Olympiad.getNobleStats(charId);
 		if (statDat == null)
 		{
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java
index 1c98c7a05b..5e55ac0979 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/olympiad/OlympiadManager.java
@@ -195,6 +195,11 @@ public class OlympiadManager
 			return false;
 		}
 		
+		if (isRegistered(player, player, true) || isInCompetition(player, player, true))
+		{
+			return false;
+		}
+		
 		StatSet statDat = Olympiad.getNobleStats(charId);
 		if (statDat == null)
 		{