4 files changed, 40 insertions, 0 deletions
diff --git a/modules/protocol/inspircd12.cpp b/modules/protocol/inspircd12.cpp
index 80a40311c..88d45bd79 100644
--- a/modules/protocol/inspircd12.cpp
+++ b/modules/protocol/inspircd12.cpp
@@ -759,6 +759,16 @@ class ProtoInspIRCd : public Module
 
 		Implementation i[] = { I_OnUserNickChange, I_OnServerSync };
 		ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation));
+
+		if (Config->Numeric.empty())
+		{
+			Anope::string numeric = ts6_sid_retrieve();
+			Me->SetSID(numeric);
+			Config->Numeric = numeric;
+		}
+
+		for (botinfo_map::iterator it = BotListByNick.begin(), it_end = BotListByNick.end(); it != it_end; ++it)
+			it->second->GenerateUID();
 	}
 
 	~ProtoInspIRCd()
diff --git a/modules/protocol/inspircd20.cpp b/modules/protocol/inspircd20.cpp
index 6586044aa..23924a2cc 100644
--- a/modules/protocol/inspircd20.cpp
+++ b/modules/protocol/inspircd20.cpp
@@ -771,6 +771,16 @@ class ProtoInspIRCd : public Module
 
 		Implementation i[] = { I_OnUserNickChange, I_OnServerSync };
 		ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation));
+
+		if (Config->Numeric.empty())
+		{
+			Anope::string numeric = ts6_sid_retrieve();
+			Me->SetSID(numeric);
+			Config->Numeric = numeric;
+		}
+
+		for (botinfo_map::iterator it = BotListByNick.begin(), it_end = BotListByNick.end(); it != it_end; ++it)
+			it->second->GenerateUID();
 	}
 
 	~ProtoInspIRCd()
diff --git a/modules/protocol/plexus.cpp b/modules/protocol/plexus.cpp
index df03ce940..356adfe2c 100644
--- a/modules/protocol/plexus.cpp
+++ b/modules/protocol/plexus.cpp
@@ -673,6 +673,16 @@ class ProtoPlexus : public Module
 
 		Implementation i[] = { I_OnServerSync };
 		ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation));
+
+		if (Config->Numeric.empty())
+		{
+			Anope::string numeric = ts6_sid_retrieve();
+			Me->SetSID(numeric);
+			Config->Numeric = numeric;
+		}
+
+		for (botinfo_map::iterator it = BotListByNick.begin(), it_end = BotListByNick.end(); it != it_end; ++it)
+			it->second->GenerateUID();
 	}
 
 	~ProtoPlexus()
diff --git a/modules/protocol/ratbox.cpp b/modules/protocol/ratbox.cpp
index e5f7a759a..fb65b80b4 100644
--- a/modules/protocol/ratbox.cpp
+++ b/modules/protocol/ratbox.cpp
@@ -598,6 +598,16 @@ class ProtoRatbox : public Module
 
 		Implementation i[] = { I_OnServerSync };
 		ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation));
+
+		if (Config->Numeric.empty())
+		{
+			Anope::string numeric = ts6_sid_retrieve();
+			Me->SetSID(numeric);
+			Config->Numeric = numeric;
+		}
+
+		for (botinfo_map::iterator it = BotListByNick.begin(), it_end = BotListByNick.end(); it != it_end; ++it)
+			it->second->GenerateUID();
 	}
 
 	~ProtoRatbox()