diff --git a/mozilla/webtools/bugzilla/.bzrrev b/mozilla/webtools/bugzilla/.bzrrev
index 2885c34e287..c892f3bda1e 100644
--- a/mozilla/webtools/bugzilla/.bzrrev
+++ b/mozilla/webtools/bugzilla/.bzrrev
@@ -1 +1 @@
-8701
\ No newline at end of file
+8702
\ No newline at end of file
diff --git a/mozilla/webtools/bugzilla/template/en/default/global/choose-classification.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/global/choose-classification.html.tmpl
index a3aab9c29b9..0ecd68dc2fa 100644
--- a/mozilla/webtools/bugzilla/template/en/default/global/choose-classification.html.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/global/choose-classification.html.tmpl
@@ -12,13 +12,14 @@
   #%]
 
 [% IF target == "enter_bug.cgi" %]
-  [% title = "Select Classification" %]
-  [% subheader = "Please select the classification." %]
+  [% title = "Enter $terms.Bug" %]
+  [% subheader = "Select Classification" %]
 [% END %]
 
 [% DEFAULT title = "Choose the classification" %]
 [% PROCESS global/header.html.tmpl %]
 
+<h2>First, you must pick a classification on which to enter [% terms.abug %]:</h2>
 <table>
   <tr>
     <th>
diff --git a/mozilla/webtools/bugzilla/template/en/default/global/choose-product.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/global/choose-product.html.tmpl
index 35a1f94a401..7bbe29c8cae 100644
--- a/mozilla/webtools/bugzilla/template/en/default/global/choose-product.html.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/global/choose-product.html.tmpl
@@ -17,7 +17,11 @@
 
 [% IF target == "enter_bug.cgi" %]
   [% title = "Enter $terms.Bug" %]
-  [% h2 = BLOCK %]First, you must pick a product on which to enter [% terms.abug %]: [% END %]
+  [% subheader = "Select Product" %]
+  [% h2 = BLOCK %]
+    [% IF Param('useclassification') %]Next[% ELSE %]First[% END %],
+    you must pick a product on which to enter [% terms.abug %]:
+  [% END %]
 [% ELSIF target == "describecomponents.cgi" %]
   [% title = "Browse" %]
   [% h2 = "Select a product category to browse:" %]