diff --git a/mozilla/webtools/bugzilla/template/en/default/bug/create/create-guided.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/bug/create/create-guided.html.tmpl
index c221e7833ad..fc05440e971 100644
--- a/mozilla/webtools/bugzilla/template/en/default/bug/create/create-guided.html.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/bug/create/create-guided.html.tmpl
@@ -117,7 +117,7 @@ function PutDescription() {
 [% ELSIF product == "Thunderbird" %]
   [% productstring = "product=Mozilla%20Application%20Suite&product=Thunderbird" %]
 [% ELSE %]
-  [% productstring = "product=" _ product FILTER uri %]
+  [% productstring = BLOCK %]product=[% product FILTER url_quote %][% END %]
 [% END %]
 
 <p>