2 files changed, 8 insertions, 1 deletions

diff --git a/src/Bindings/PluginManager.cpp b/src/Bindings/PluginManager.cpp
index 15bea22bd..db2493955 100644
--- a/src/Bindings/PluginManager.cpp
+++ b/src/Bindings/PluginManager.cpp
@@ -1445,6 +1445,13 @@ cPluginManager::CommandResult cPluginManager::HandleCommand(cPlayer & a_Player,
 	if (cmd == m_Commands.end())
 	{
 		// Command not found
+		// If it started with a slash, ask the plugins if they still want to handle it:
+		if (!a_Command.empty() && (a_Command[0] == '/'))
+		{
+			CommandResult Result = crUnknownCommand;
+			CallHookExecuteCommand(&a_Player, Split, a_Command, Result);
+			return Result;
+		}
 		return crUnknownCommand;
 	}
 
diff --git a/src/ClientHandle.cpp b/src/ClientHandle.cpp
index 7117229f7..c8ccc1cf5 100644
--- a/src/ClientHandle.cpp
+++ b/src/ClientHandle.cpp
@@ -1473,7 +1473,7 @@ void cClientHandle::HandleChat(const AString & a_Message)
 		Color.clear();
 	}
 	Msg.AddTextPart(AString("<") + m_Player->GetName() + "> ", Color);
-	Msg.ParseText(a_Message);
+	Msg.ParseText(Message);
 	Msg.UnderlineUrls();
 	m_Player->GetWorld()->BroadcastChat(Msg);
 }