1 files changed, 4 insertions, 16 deletions
diff --git a/src/modules/m_conn_umodes.cpp b/src/modules/m_conn_umodes.cpp
index bae9317d5..1e3ea1a49 100644
--- a/src/modules/m_conn_umodes.cpp
+++ b/src/modules/m_conn_umodes.cpp
@@ -51,26 +51,14 @@ class ModuleModesOnConnect : public Module
 			std::string buf;
 			std::stringstream ss(ThisModes);
 
-			std::vector<std::string> tokens;
-
-			// split ThisUserModes into modes and mode params
-			while (ss >> buf)
-				tokens.push_back(buf);
-
 			std::vector<std::string> modes;
 			modes.push_back(user->nick);
-			modes.push_back(tokens[0]);
 
-			if (tokens.size() > 1)
-			{
-				// process mode params
-				for (unsigned int k = 1; k < tokens.size(); k++)
-				{
-					modes.push_back(tokens[k]);
-				}
-			}
+			// split ThisUserModes into modes and mode params
+			while (ss >> buf)
+				modes.push_back(buf);
 
-			ServerInstance->Parser->CallHandler("MODE", modes, user);
+			ServerInstance->Modes->Process(modes, user);
 		}
 
 		memcpy(ServerInstance->Config->DisabledUModes, save, 64);