Only send ACCOUNT and CHGHOST to clients that have sent NICK/USER.

Closes #1657.

2 files changed, 6 insertions, 0 deletions

diff --git a/src/modules/m_ircv3.cpp b/src/modules/m_ircv3.cpp
index 14b1cf8a1..d65cd8695 100644
--- a/src/modules/m_ircv3.cpp
+++ b/src/modules/m_ircv3.cpp
@@ -139,6 +139,9 @@ class ModuleIRCv3
 
 	void OnAccountChange(User* user, const std::string& newaccount) CXX11_OVERRIDE
 	{
+		if (!(user->registered & REG_NICKUSER))
+			return;
+
 		// Logged in: 1 parameter which is the account name
 		// Logged out: 1 parameter which is a "*"
 		ClientProtocol::Message msg("ACCOUNT", user);
diff --git a/src/modules/m_ircv3_chghost.cpp b/src/modules/m_ircv3_chghost.cpp
index d78689178..289f05753 100644
--- a/src/modules/m_ircv3_chghost.cpp
+++ b/src/modules/m_ircv3_chghost.cpp
@@ -28,6 +28,9 @@ class ModuleIRCv3ChgHost : public Module
 
 	void DoChgHost(User* user, const std::string& ident, const std::string& host)
 	{
+		if (!(user->registered & REG_NICKUSER))
+			return;
+
 		ClientProtocol::Message msg("CHGHOST", user);
 		msg.PushParamRef(ident);
 		msg.PushParamRef(host);