diff --git a/src/lib/synergy/ToolApp.cpp b/src/lib/synergy/ToolApp.cpp
index 0549c396..fb2ca7cc 100644
--- a/src/lib/synergy/ToolApp.cpp
+++ b/src/lib/synergy/ToolApp.cpp
@@ -214,8 +214,8 @@ ToolApp::notifyActivation()
 		std::stringstream ss;
 		ss <<  JSON_URL << "notify/";
 		ss << "?action=" << action;
-		ss << "&identity=" << identity;
-		ss << "&mac=" << macHash;
+		ss << "&identity=" << ARCH->internet().urlEncode(identity);
+		ss << "&mac=" << ARCH->internet().urlEncode(macHash);
 		ss << "&os=" << ARCH->internet().urlEncode(ARCH->getOSName());
 		ss << "&arch=" << ARCH->internet().urlEncode(ARCH->getPlatformName());