Only remove collide timers if the account matches on id

1 files changed, 6 insertions, 1 deletions

diff --git a/modules/pseudoclients/nickserv.cpp b/modules/pseudoclients/nickserv.cpp
index c51a15360..ee1049195 100644
--- a/modules/pseudoclients/nickserv.cpp
+++ b/modules/pseudoclients/nickserv.cpp
@@ -39,6 +39,11 @@ class NickServCollide : public Timer
 		return u;
 	}
 
+	NickAlias *GetNick()
+	{
+		return na;
+	}
+
 	void Tick(time_t t) anope_override
 	{
 		if (!u || !na)
@@ -361,7 +366,7 @@ class NickServCore : public Module, public NickServService
 		for (std::set<NickServCollide *>::iterator it = collides.begin(); it != collides.end(); ++it)
 		{
 			NickServCollide *c = *it;
-			if (c->GetUser() == u)
+			if (c->GetUser() == u && c->GetNick() && c->GetNick()->nc == u->Account())
 			{
 				delete c;
 				break;