Reference accounts in the database by their id not their nick.

1 files changed, 5 insertions, 3 deletions

diff --git a/modules/nickserv/ns_ajoin.cpp b/modules/nickserv/ns_ajoin.cpp
index d60e30f07..c2e432f2e 100644
--- a/modules/nickserv/ns_ajoin.cpp
+++ b/modules/nickserv/ns_ajoin.cpp
@@ -55,7 +55,7 @@ struct AJoinEntryType final
 		if (!aj->owner)
 			return;
 
-		data.Store("owner", aj->owner->display);
+		data.Store("ownerid", aj->owner->GetId());
 		data.Store("channel", aj->channel);
 		data.Store("key", aj->key);
 	}
@@ -63,10 +63,12 @@ struct AJoinEntryType final
 	Serializable *Unserialize(Serializable *obj, Serialize::Data &sd) const override
 	{
 		Anope::string sowner;
+		uint64_t sownerid = 0;
 
-		sd["owner"] >> sowner;
+		sd["owner"] >> sowner; // Deprecated 2.0 field
+		sd["ownerid"] >> sownerid;
 
-		NickCore *nc = NickCore::Find(sowner);
+		auto *nc = sownerid ? NickCore::FindId(sownerid) : NickCore::Find(sowner);
 		if (nc == NULL)
 			return NULL;