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 492dd2e7bc..4fe1edd1b7 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
@@ -26,6 +26,7 @@ import java.util.concurrent.ConcurrentHashMap;
 import org.l2jmobius.Config;
 import org.l2jmobius.gameserver.enums.CategoryType;
 import org.l2jmobius.gameserver.instancemanager.AntiFeedManager;
+import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
@@ -194,6 +195,22 @@ public class OlympiadManager
 			return false;
 		}
 		
+		StatSet statDat = Olympiad.getNobleStats(charId);
+		if (statDat == null)
+		{
+			statDat = new StatSet();
+			statDat.set(Olympiad.CLASS_ID, player.getBaseClass());
+			statDat.set(Olympiad.CHAR_NAME, player.getName());
+			statDat.set(Olympiad.POINTS, Olympiad.DEFAULT_POINTS);
+			statDat.set(Olympiad.COMP_DONE, 0);
+			statDat.set(Olympiad.COMP_WON, 0);
+			statDat.set(Olympiad.COMP_LOST, 0);
+			statDat.set(Olympiad.COMP_DRAWN, 0);
+			statDat.set(Olympiad.COMP_DONE_WEEK, 0);
+			statDat.set("to_save", true);
+			Olympiad.addNobleStats(charId, statDat);
+		}
+		
 		switch (type)
 		{
 			case CLASSED:
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 bc0a1d7b53..12a077b8ea 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
@@ -26,6 +26,7 @@ import java.util.concurrent.ConcurrentHashMap;
 import org.l2jmobius.Config;
 import org.l2jmobius.gameserver.enums.CategoryType;
 import org.l2jmobius.gameserver.instancemanager.AntiFeedManager;
+import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
@@ -194,6 +195,22 @@ public class OlympiadManager
 			return false;
 		}
 		
+		StatSet statDat = Olympiad.getNobleStats(charId);
+		if (statDat == null)
+		{
+			statDat = new StatSet();
+			statDat.set(Olympiad.CLASS_ID, player.getBaseClass());
+			statDat.set(Olympiad.CHAR_NAME, player.getName());
+			statDat.set(Olympiad.POINTS, Olympiad.DEFAULT_POINTS);
+			statDat.set(Olympiad.COMP_DONE, 0);
+			statDat.set(Olympiad.COMP_WON, 0);
+			statDat.set(Olympiad.COMP_LOST, 0);
+			statDat.set(Olympiad.COMP_DRAWN, 0);
+			statDat.set(Olympiad.COMP_DONE_WEEK, 0);
+			statDat.set("to_save", true);
+			Olympiad.addNobleStats(charId, statDat);
+		}
+		
 		switch (type)
 		{
 			case CLASSED:
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 bc0a1d7b53..12a077b8ea 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
@@ -26,6 +26,7 @@ import java.util.concurrent.ConcurrentHashMap;
 import org.l2jmobius.Config;
 import org.l2jmobius.gameserver.enums.CategoryType;
 import org.l2jmobius.gameserver.instancemanager.AntiFeedManager;
+import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
@@ -194,6 +195,22 @@ public class OlympiadManager
 			return false;
 		}
 		
+		StatSet statDat = Olympiad.getNobleStats(charId);
+		if (statDat == null)
+		{
+			statDat = new StatSet();
+			statDat.set(Olympiad.CLASS_ID, player.getBaseClass());
+			statDat.set(Olympiad.CHAR_NAME, player.getName());
+			statDat.set(Olympiad.POINTS, Olympiad.DEFAULT_POINTS);
+			statDat.set(Olympiad.COMP_DONE, 0);
+			statDat.set(Olympiad.COMP_WON, 0);
+			statDat.set(Olympiad.COMP_LOST, 0);
+			statDat.set(Olympiad.COMP_DRAWN, 0);
+			statDat.set(Olympiad.COMP_DONE_WEEK, 0);
+			statDat.set("to_save", true);
+			Olympiad.addNobleStats(charId, statDat);
+		}
+		
 		switch (type)
 		{
 			case CLASSED:
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 9dcc9a1401..bb7c8d5bbc 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
@@ -26,6 +26,7 @@ import java.util.concurrent.ConcurrentHashMap;
 import org.l2jmobius.Config;
 import org.l2jmobius.gameserver.enums.CategoryType;
 import org.l2jmobius.gameserver.instancemanager.AntiFeedManager;
+import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
@@ -194,6 +195,22 @@ public class OlympiadManager
 			return false;
 		}
 		
+		StatSet statDat = Olympiad.getNobleStats(charId);
+		if (statDat == null)
+		{
+			statDat = new StatSet();
+			statDat.set(Olympiad.CLASS_ID, player.getBaseClass());
+			statDat.set(Olympiad.CHAR_NAME, player.getName());
+			statDat.set(Olympiad.POINTS, Olympiad.DEFAULT_POINTS);
+			statDat.set(Olympiad.COMP_DONE, 0);
+			statDat.set(Olympiad.COMP_WON, 0);
+			statDat.set(Olympiad.COMP_LOST, 0);
+			statDat.set(Olympiad.COMP_DRAWN, 0);
+			statDat.set(Olympiad.COMP_DONE_WEEK, 0);
+			statDat.set("to_save", true);
+			Olympiad.addNobleStats(charId, statDat);
+		}
+		
 		switch (type)
 		{
 			case CLASSED:
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 9dcc9a1401..bb7c8d5bbc 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
@@ -26,6 +26,7 @@ import java.util.concurrent.ConcurrentHashMap;
 import org.l2jmobius.Config;
 import org.l2jmobius.gameserver.enums.CategoryType;
 import org.l2jmobius.gameserver.instancemanager.AntiFeedManager;
+import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
@@ -194,6 +195,22 @@ public class OlympiadManager
 			return false;
 		}
 		
+		StatSet statDat = Olympiad.getNobleStats(charId);
+		if (statDat == null)
+		{
+			statDat = new StatSet();
+			statDat.set(Olympiad.CLASS_ID, player.getBaseClass());
+			statDat.set(Olympiad.CHAR_NAME, player.getName());
+			statDat.set(Olympiad.POINTS, Olympiad.DEFAULT_POINTS);
+			statDat.set(Olympiad.COMP_DONE, 0);
+			statDat.set(Olympiad.COMP_WON, 0);
+			statDat.set(Olympiad.COMP_LOST, 0);
+			statDat.set(Olympiad.COMP_DRAWN, 0);
+			statDat.set(Olympiad.COMP_DONE_WEEK, 0);
+			statDat.set("to_save", true);
+			Olympiad.addNobleStats(charId, statDat);
+		}
+		
 		switch (type)
 		{
 			case CLASSED:
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 bd6cf9fc49..bbcf3200dd 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
@@ -26,6 +26,7 @@ import java.util.concurrent.ConcurrentHashMap;
 import org.l2jmobius.Config;
 import org.l2jmobius.gameserver.enums.CategoryType;
 import org.l2jmobius.gameserver.instancemanager.AntiFeedManager;
+import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
@@ -194,6 +195,22 @@ public class OlympiadManager
 			return false;
 		}
 		
+		StatSet statDat = Olympiad.getNobleStats(charId);
+		if (statDat == null)
+		{
+			statDat = new StatSet();
+			statDat.set(Olympiad.CLASS_ID, player.getBaseClass());
+			statDat.set(Olympiad.CHAR_NAME, player.getName());
+			statDat.set(Olympiad.POINTS, Olympiad.DEFAULT_POINTS);
+			statDat.set(Olympiad.COMP_DONE, 0);
+			statDat.set(Olympiad.COMP_WON, 0);
+			statDat.set(Olympiad.COMP_LOST, 0);
+			statDat.set(Olympiad.COMP_DRAWN, 0);
+			statDat.set(Olympiad.COMP_DONE_WEEK, 0);
+			statDat.set("to_save", true);
+			Olympiad.addNobleStats(charId, statDat);
+		}
+		
 		switch (type)
 		{
 			case CLASSED:
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 bd6cf9fc49..bbcf3200dd 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
@@ -26,6 +26,7 @@ import java.util.concurrent.ConcurrentHashMap;
 import org.l2jmobius.Config;
 import org.l2jmobius.gameserver.enums.CategoryType;
 import org.l2jmobius.gameserver.instancemanager.AntiFeedManager;
+import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
@@ -194,6 +195,22 @@ public class OlympiadManager
 			return false;
 		}
 		
+		StatSet statDat = Olympiad.getNobleStats(charId);
+		if (statDat == null)
+		{
+			statDat = new StatSet();
+			statDat.set(Olympiad.CLASS_ID, player.getBaseClass());
+			statDat.set(Olympiad.CHAR_NAME, player.getName());
+			statDat.set(Olympiad.POINTS, Olympiad.DEFAULT_POINTS);
+			statDat.set(Olympiad.COMP_DONE, 0);
+			statDat.set(Olympiad.COMP_WON, 0);
+			statDat.set(Olympiad.COMP_LOST, 0);
+			statDat.set(Olympiad.COMP_DRAWN, 0);
+			statDat.set(Olympiad.COMP_DONE_WEEK, 0);
+			statDat.set("to_save", true);
+			Olympiad.addNobleStats(charId, statDat);
+		}
+		
 		switch (type)
 		{
 			case CLASSED:
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 52b711bb12..46f6ab3b46 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
@@ -26,6 +26,7 @@ import java.util.concurrent.ConcurrentHashMap;
 import org.l2jmobius.Config;
 import org.l2jmobius.gameserver.enums.CategoryType;
 import org.l2jmobius.gameserver.instancemanager.AntiFeedManager;
+import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
@@ -194,6 +195,22 @@ public class OlympiadManager
 			return false;
 		}
 		
+		StatSet statDat = Olympiad.getNobleStats(charId);
+		if (statDat == null)
+		{
+			statDat = new StatSet();
+			statDat.set(Olympiad.CLASS_ID, player.getBaseClass());
+			statDat.set(Olympiad.CHAR_NAME, player.getName());
+			statDat.set(Olympiad.POINTS, Olympiad.DEFAULT_POINTS);
+			statDat.set(Olympiad.COMP_DONE, 0);
+			statDat.set(Olympiad.COMP_WON, 0);
+			statDat.set(Olympiad.COMP_LOST, 0);
+			statDat.set(Olympiad.COMP_DRAWN, 0);
+			statDat.set(Olympiad.COMP_DONE_WEEK, 0);
+			statDat.set("to_save", true);
+			Olympiad.addNobleStats(charId, statDat);
+		}
+		
 		switch (type)
 		{
 			case CLASSED:
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 cc87b0ecb2..1c98c7a05b 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
@@ -26,6 +26,7 @@ import java.util.concurrent.ConcurrentHashMap;
 import org.l2jmobius.Config;
 import org.l2jmobius.gameserver.enums.CategoryType;
 import org.l2jmobius.gameserver.instancemanager.AntiFeedManager;
+import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
@@ -194,6 +195,22 @@ public class OlympiadManager
 			return false;
 		}
 		
+		StatSet statDat = Olympiad.getNobleStats(charId);
+		if (statDat == null)
+		{
+			statDat = new StatSet();
+			statDat.set(Olympiad.CLASS_ID, player.getBaseClass());
+			statDat.set(Olympiad.CHAR_NAME, player.getName());
+			statDat.set(Olympiad.POINTS, Olympiad.DEFAULT_POINTS);
+			statDat.set(Olympiad.COMP_DONE, 0);
+			statDat.set(Olympiad.COMP_WON, 0);
+			statDat.set(Olympiad.COMP_LOST, 0);
+			statDat.set(Olympiad.COMP_DRAWN, 0);
+			statDat.set(Olympiad.COMP_DONE_WEEK, 0);
+			statDat.set("to_save", true);
+			Olympiad.addNobleStats(charId, statDat);
+		}
+		
 		switch (type)
 		{
 			case CLASSED:
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 cc87b0ecb2..1c98c7a05b 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
@@ -26,6 +26,7 @@ import java.util.concurrent.ConcurrentHashMap;
 import org.l2jmobius.Config;
 import org.l2jmobius.gameserver.enums.CategoryType;
 import org.l2jmobius.gameserver.instancemanager.AntiFeedManager;
+import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
@@ -194,6 +195,22 @@ public class OlympiadManager
 			return false;
 		}
 		
+		StatSet statDat = Olympiad.getNobleStats(charId);
+		if (statDat == null)
+		{
+			statDat = new StatSet();
+			statDat.set(Olympiad.CLASS_ID, player.getBaseClass());
+			statDat.set(Olympiad.CHAR_NAME, player.getName());
+			statDat.set(Olympiad.POINTS, Olympiad.DEFAULT_POINTS);
+			statDat.set(Olympiad.COMP_DONE, 0);
+			statDat.set(Olympiad.COMP_WON, 0);
+			statDat.set(Olympiad.COMP_LOST, 0);
+			statDat.set(Olympiad.COMP_DRAWN, 0);
+			statDat.set(Olympiad.COMP_DONE_WEEK, 0);
+			statDat.set("to_save", true);
+			Olympiad.addNobleStats(charId, statDat);
+		}
+		
 		switch (type)
 		{
 			case CLASSED:
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 cc87b0ecb2..1c98c7a05b 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
@@ -26,6 +26,7 @@ import java.util.concurrent.ConcurrentHashMap;
 import org.l2jmobius.Config;
 import org.l2jmobius.gameserver.enums.CategoryType;
 import org.l2jmobius.gameserver.instancemanager.AntiFeedManager;
+import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
@@ -194,6 +195,22 @@ public class OlympiadManager
 			return false;
 		}
 		
+		StatSet statDat = Olympiad.getNobleStats(charId);
+		if (statDat == null)
+		{
+			statDat = new StatSet();
+			statDat.set(Olympiad.CLASS_ID, player.getBaseClass());
+			statDat.set(Olympiad.CHAR_NAME, player.getName());
+			statDat.set(Olympiad.POINTS, Olympiad.DEFAULT_POINTS);
+			statDat.set(Olympiad.COMP_DONE, 0);
+			statDat.set(Olympiad.COMP_WON, 0);
+			statDat.set(Olympiad.COMP_LOST, 0);
+			statDat.set(Olympiad.COMP_DRAWN, 0);
+			statDat.set(Olympiad.COMP_DONE_WEEK, 0);
+			statDat.set("to_save", true);
+			Olympiad.addNobleStats(charId, statDat);
+		}
+		
 		switch (type)
 		{
 			case CLASSED:
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 cc87b0ecb2..1c98c7a05b 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
@@ -26,6 +26,7 @@ import java.util.concurrent.ConcurrentHashMap;
 import org.l2jmobius.Config;
 import org.l2jmobius.gameserver.enums.CategoryType;
 import org.l2jmobius.gameserver.instancemanager.AntiFeedManager;
+import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
@@ -194,6 +195,22 @@ public class OlympiadManager
 			return false;
 		}
 		
+		StatSet statDat = Olympiad.getNobleStats(charId);
+		if (statDat == null)
+		{
+			statDat = new StatSet();
+			statDat.set(Olympiad.CLASS_ID, player.getBaseClass());
+			statDat.set(Olympiad.CHAR_NAME, player.getName());
+			statDat.set(Olympiad.POINTS, Olympiad.DEFAULT_POINTS);
+			statDat.set(Olympiad.COMP_DONE, 0);
+			statDat.set(Olympiad.COMP_WON, 0);
+			statDat.set(Olympiad.COMP_LOST, 0);
+			statDat.set(Olympiad.COMP_DRAWN, 0);
+			statDat.set(Olympiad.COMP_DONE_WEEK, 0);
+			statDat.set("to_save", true);
+			Olympiad.addNobleStats(charId, statDat);
+		}
+		
 		switch (type)
 		{
 			case CLASSED:
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 cc87b0ecb2..1c98c7a05b 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
@@ -26,6 +26,7 @@ import java.util.concurrent.ConcurrentHashMap;
 import org.l2jmobius.Config;
 import org.l2jmobius.gameserver.enums.CategoryType;
 import org.l2jmobius.gameserver.instancemanager.AntiFeedManager;
+import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
@@ -194,6 +195,22 @@ public class OlympiadManager
 			return false;
 		}
 		
+		StatSet statDat = Olympiad.getNobleStats(charId);
+		if (statDat == null)
+		{
+			statDat = new StatSet();
+			statDat.set(Olympiad.CLASS_ID, player.getBaseClass());
+			statDat.set(Olympiad.CHAR_NAME, player.getName());
+			statDat.set(Olympiad.POINTS, Olympiad.DEFAULT_POINTS);
+			statDat.set(Olympiad.COMP_DONE, 0);
+			statDat.set(Olympiad.COMP_WON, 0);
+			statDat.set(Olympiad.COMP_LOST, 0);
+			statDat.set(Olympiad.COMP_DRAWN, 0);
+			statDat.set(Olympiad.COMP_DONE_WEEK, 0);
+			statDat.set("to_save", true);
+			Olympiad.addNobleStats(charId, statDat);
+		}
+		
 		switch (type)
 		{
 			case CLASSED:
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 9def2976d7..0220b42360 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
@@ -26,6 +26,7 @@ import java.util.concurrent.ConcurrentHashMap;
 import org.l2jmobius.Config;
 import org.l2jmobius.gameserver.enums.CategoryType;
 import org.l2jmobius.gameserver.instancemanager.AntiFeedManager;
+import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
@@ -194,6 +195,22 @@ public class OlympiadManager
 			return false;
 		}
 		
+		StatSet statDat = Olympiad.getNobleStats(charId);
+		if (statDat == null)
+		{
+			statDat = new StatSet();
+			statDat.set(Olympiad.CLASS_ID, player.getBaseClass());
+			statDat.set(Olympiad.CHAR_NAME, player.getName());
+			statDat.set(Olympiad.POINTS, Olympiad.DEFAULT_POINTS);
+			statDat.set(Olympiad.COMP_DONE, 0);
+			statDat.set(Olympiad.COMP_WON, 0);
+			statDat.set(Olympiad.COMP_LOST, 0);
+			statDat.set(Olympiad.COMP_DRAWN, 0);
+			statDat.set(Olympiad.COMP_DONE_WEEK, 0);
+			statDat.set("to_save", true);
+			Olympiad.addNobleStats(charId, statDat);
+		}
+		
 		switch (type)
 		{
 			case CLASSED:
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 cc87b0ecb2..1c98c7a05b 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
@@ -26,6 +26,7 @@ import java.util.concurrent.ConcurrentHashMap;
 import org.l2jmobius.Config;
 import org.l2jmobius.gameserver.enums.CategoryType;
 import org.l2jmobius.gameserver.instancemanager.AntiFeedManager;
+import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
@@ -194,6 +195,22 @@ public class OlympiadManager
 			return false;
 		}
 		
+		StatSet statDat = Olympiad.getNobleStats(charId);
+		if (statDat == null)
+		{
+			statDat = new StatSet();
+			statDat.set(Olympiad.CLASS_ID, player.getBaseClass());
+			statDat.set(Olympiad.CHAR_NAME, player.getName());
+			statDat.set(Olympiad.POINTS, Olympiad.DEFAULT_POINTS);
+			statDat.set(Olympiad.COMP_DONE, 0);
+			statDat.set(Olympiad.COMP_WON, 0);
+			statDat.set(Olympiad.COMP_LOST, 0);
+			statDat.set(Olympiad.COMP_DRAWN, 0);
+			statDat.set(Olympiad.COMP_DONE_WEEK, 0);
+			statDat.set("to_save", true);
+			Olympiad.addNobleStats(charId, statDat);
+		}
+		
 		switch (type)
 		{
 			case CLASSED: