diff --git a/webtools/bugzilla/template/en/default/bug/process/verify-new-product.html.tmpl b/webtools/bugzilla/template/en/default/bug/process/verify-new-product.html.tmpl
index 50600923d704..8569158a7409 100644
--- a/webtools/bugzilla/template/en/default/bug/process/verify-new-product.html.tmpl
+++ b/webtools/bugzilla/template/en/default/bug/process/verify-new-product.html.tmpl
@@ -36,7 +36,8 @@
 
 <form action="process_bug.cgi" method="post">
 
-[% PROCESS "global/hidden-fields.html.tmpl" exclude="^version|component|target_milestone$" %]
+[% PROCESS "global/hidden-fields.html.tmpl" 
+     exclude=(verify_fields ? "^version|component|target_milestone$" : "") %]
 
 [%# Verify the version, component, and target milestone fields. %]
 [% IF verify_fields %]
diff --git a/webtools/bugzilla/template/en/default/global/hidden-fields.html.tmpl b/webtools/bugzilla/template/en/default/global/hidden-fields.html.tmpl
index 85df62435b28..76040bea1b1a 100644
--- a/webtools/bugzilla/template/en/default/global/hidden-fields.html.tmpl
+++ b/webtools/bugzilla/template/en/default/global/hidden-fields.html.tmpl
@@ -27,6 +27,6 @@
  
 [%# Generate hidden form fields for non-excluded fields. %]
 [% FOREACH field = form %]
-  [% NEXT IF field.key.search(exclude) %]
+  [% NEXT IF exclude && field.key.search(exclude) %]
   <input type="hidden" name="[% field.key %]" value="[% field.value FILTER html %]">
 [% END %]