3 files changed, 6 insertions, 6 deletions
diff --git a/src/modules/m_spanningtree/main.cpp b/src/modules/m_spanningtree/main.cpp
index 3e2b5d3b5..ed0165c0e 100644
--- a/src/modules/m_spanningtree/main.cpp
+++ b/src/modules/m_spanningtree/main.cpp
@@ -711,13 +711,13 @@ void ModuleSpanningTree::OnRemoteKill(User* source, User* dest, const std::strin
 	if (!IS_LOCAL(source))
 		return; // Only start routing if we're origin.
 
+	dest->Extend("operquit", new std::string(operreason));
 	parameterlist params;
-	params.push_back(":"+reason);
+	params.push_back(":"+operreason);
 	Utils->DoOneToMany(dest->uuid,"OPERQUIT",params);
 	params.clear();
 	params.push_back(dest->uuid);
 	params.push_back(":"+reason);
-	dest->SetOperQuit(operreason);
 	Utils->DoOneToMany(source->uuid,"KILL",params);
 }
 
diff --git a/src/modules/m_spanningtree/operquit.cpp b/src/modules/m_spanningtree/operquit.cpp
index a71f73da7..5260cd990 100644
--- a/src/modules/m_spanningtree/operquit.cpp
+++ b/src/modules/m_spanningtree/operquit.cpp
@@ -30,7 +30,7 @@ bool TreeSocket::OperQuit(const std::string &prefix, parameterlist &params)
 
 	if (u)
 	{
-		u->SetOperQuit(params[0]);
+		u->Extend("operquit", new std::string(params[0]));
 		params[0] = ":" + params[0];
 		Utils->DoOneToAllButSender(prefix,"OPERQUIT",params,prefix);
 	}
diff --git a/src/modules/m_spanningtree/treeserver.cpp b/src/modules/m_spanningtree/treeserver.cpp
index 6c8c6a33c..c9f4cfdfa 100644
--- a/src/modules/m_spanningtree/treeserver.cpp
+++ b/src/modules/m_spanningtree/treeserver.cpp
@@ -176,13 +176,13 @@ int TreeServer::QuitUsers(const std::string &reason)
 		User* a = (User*)*n;
 		if (!IS_LOCAL(a))
 		{
+			if (this->Utils->quiet_bursts)
+				a->quietquit = true;
+
 			if (ServerInstance->Config->HideSplits)
 				ServerInstance->Users->QuitUser(a, "*.net *.split", reason_s);
 			else
 				ServerInstance->Users->QuitUser(a, reason_s);
-
-			if (this->Utils->quiet_bursts)
-				a->quietquit = true;
 		}
 	}
 	return time_to_die.size();