diff --git a/bin/serve.cmd b/bin/serve.cmd
index a399a4192..0f663ec5e 100644
--- a/bin/serve.cmd
+++ b/bin/serve.cmd
@@ -7,5 +7,5 @@ rem Optional parameter is the username for signing edits
 node .\tiddlywiki.js ^
 	editions\tw5.com-server ^
 	--verbose ^
-	--server 8080 $:/core/save/all text/plain text/html %1 %2^
+	--server 8080 $:/core/save/all text/plain text/html "%1" "%2" "%3"^
 	|| exit 1
diff --git a/bin/serve.sh b/bin/serve.sh
index 2d0c0f8c6..bf6666c58 100755
--- a/bin/serve.sh
+++ b/bin/serve.sh
@@ -7,5 +7,5 @@
 node ./tiddlywiki.js \
 	editions/tw5.com-server \
 	--verbose \
-	--server 8080 $:/core/save/all text/plain text/html $1 $2\
+	--server 8080 $:/core/save/all text/plain text/html "$1" "$2" "$3"\
 	|| exit 1