diff --git a/Net/src/HTMLForm.cpp b/Net/src/HTMLForm.cpp
index 7b5d19d1c..00e0a24a1 100644
--- a/Net/src/HTMLForm.cpp
+++ b/Net/src/HTMLForm.cpp
@@ -348,9 +348,9 @@ void HTMLForm::writeUrl(std::ostream& ostr)
 	{
 		if (it != begin()) ostr << "&";
 		std::string name;
-		URI::encode(it->first, "=&+;", name);
+		URI::encode(it->first, "!?#/'\",;:$&()[]*+=@", name);
 		std::string value;
-		URI::encode(it->second, "=&+;", value);
+		URI::encode(it->second, "!?#/'\",;:$&()[]*+=@", value);
 		ostr << name << "=" << value;
 	}
 }