diff --git a/frontends/cgi/live-build-cgi b/frontends/cgi/live-build-cgi
index 454c8abb2..5a65bce89 100755
--- a/frontends/cgi/live-build-cgi
+++ b/frontends/cgi/live-build-cgi
@@ -32,6 +32,14 @@ fi
 echo "Content-type: text/html"
 echo
 
+#QUERY_STRING=`cat /dev/stdin`
+QUERY_STRING=$(cat /dev/stdin)
+# Translate parameters
+QUERY_STRING=$(echo "${QUERY_STRING}" | sed -e 's/%2F/\//g' -e 's/+/ /g' -e 's/%3B/;/g' -e 's/%7E/~/g' -e 's/%3A/:/g' -e 's/%40/@/g' -e 's/%3D/=/g' -e 's/%2B/+/g')
+# Debug the filtering string
+# echo ${QUERY_STRING}
+
+
 # Sending html header
 cat "${_TEMPLATES}"/header.html
 
@@ -52,11 +60,6 @@ else
 	# Converting '=':	sed 's/%3D/=/g'
 	# Converting '+':	sed 's/%2B/+/g'
 
-	# Translate parameters
-	QUERY_STRING=$(echo "${QUERY_STRING}" | sed -e 's/%2F/\//g' -e 's/+/ /g' -e 's/%3B/;/g' -e 's/%7E/~/g' -e 's/%3A/:/g' -e 's/%40/@/g' -e 's/%3D/=/g' -e 's/%2B/+/g')
-	# Debug the filtering string
-	# echo ${QUERY_STRING}
-
 	# Email
 	_EMAIL=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])email=[-0-9a-zA-Z._@]+' | cut -f 2 -d '=' | head -n1)
 
diff --git a/templates/cgi/debian/form.html b/templates/cgi/debian/form.html
index 1a2a9026e..e8c934859 100644
--- a/templates/cgi/debian/form.html
+++ b/templates/cgi/debian/form.html
@@ -1,7 +1,7 @@
 
 <h3>Submit your parameters (<b>working</b> email address is required) to generate your very own live system.</h3>
 
-<form action="live-build" method="get">
+<form action="live-build" method="post">
 
 <fieldset>