diff --git a/mozilla/extensions/reporter/locales/en-US/chrome/reportWizard.dtd b/mozilla/extensions/reporter/locales/en-US/chrome/reportWizard.dtd
index 6910ae39b2e..57f04cf92bb 100644
--- a/mozilla/extensions/reporter/locales/en-US/chrome/reportWizard.dtd
+++ b/mozilla/extensions/reporter/locales/en-US/chrome/reportWizard.dtd
@@ -21,15 +21,14 @@
 
 <!ENTITY reportForm.problem_type.chooseOne.title    "Choose One...">
 
-<!-- DO *NOT* Add/change/modify (except localization) without consulting with r.m.o server first! -->
-<!ENTITY reportForm.problem_type.item3_1.title      "Appears Wrong">
-<!ENTITY reportForm.problem_type.item3_2.title      "Doesn't Appear">
-<!ENTITY reportForm.problem_type.item3_3.title      "Doesn't Function Properly">
-<!ENTITY reportForm.problem_type.item3_4.title      "Doesn't Load">
-<!ENTITY reportForm.problem_type.item3_5.title      "Mozilla Blocked / (&quot;Netscape Not Supported&quot;)">
-<!ENTITY reportForm.problem_type.item1_1.title      "Freeze">
-<!ENTITY reportForm.problem_type.item1_2.title      "Crashes Mozilla">
-<!ENTITY reportForm.problem_type.item2_1.title      "Slows Down Mozilla">
+<!-- DO *NOT* Add/change/modify (except localization) without consulting with r.m.o server admin first! -->
+<!ENTITY reportForm.problem_type.item1.title        "Browser not supported">
+<!ENTITY reportForm.problem_type.item2.title        "Can't log in">
+<!ENTITY reportForm.problem_type.item3.title        "Plugin not shown">
+<!ENTITY reportForm.problem_type.item4.title        "Other content missing">
+<!ENTITY reportForm.problem_type.item5.title        "Behavior wrong">
+<!ENTITY reportForm.problem_type.item6.title        "Appearance wrong">
+<!ENTITY reportForm.problem_type.item7.title        "Other problem">
 
 <!ENTITY reportForm.describe.title                  "Describe Problem:">
 <!ENTITY reportForm.platform.title                  "Platform:">
diff --git a/mozilla/extensions/reporter/resources/content/reporter/reportWizard.js b/mozilla/extensions/reporter/resources/content/reporter/reportWizard.js
index d441e971c54..617e0c3e645 100644
--- a/mozilla/extensions/reporter/resources/content/reporter/reportWizard.js
+++ b/mozilla/extensions/reporter/resources/content/reporter/reportWizard.js
@@ -192,7 +192,7 @@ function initForm(){
 }
 
 function validateForm() {
-  if(document.getElementById('problem_type').value != "0_0")
+  if(document.getElementById('problem_type').value != "0")
     document.getElementById('reportWizard').canAdvance= true;
   else
     document.getElementById('reportWizard').canAdvance= false;
diff --git a/mozilla/extensions/reporter/resources/content/reporter/reportWizard.xul b/mozilla/extensions/reporter/resources/content/reporter/reportWizard.xul
index babdd8457b2..6f68c5db823 100644
--- a/mozilla/extensions/reporter/resources/content/reporter/reportWizard.xul
+++ b/mozilla/extensions/reporter/resources/content/reporter/reportWizard.xul
@@ -104,19 +104,17 @@
           <!-- XXX: Perhaps this should eventually/maybe come from somewhere else?  Eh, not sure so lets just hardcode this for now. -->
           <menulist label="problem_type" id="problem_type" oncommand="validateForm()">
             <menupopup>
-              <!-- DO *NOT* Add/change/modify without consulting with r.m.o server first -->
-              <menuitem label="&reportForm.problem_type.chooseOne.title;" value="0_0"/>
-              <!--Crash -->
-              <menuitem label="&reportForm.problem_type.item1_1.title;" value="1_1"/>
-              <menuitem label="&reportForm.problem_type.item1_2.title;" value="1_2"/>
-              <!--Performance-->
-              <menuitem label="&reportForm.problem_type.item2_1.title;" value="2_1"/>
-              <!--Compatibility"-->
-              <menuitem label="&reportForm.problem_type.item3_1.title;" value="3_1"/>
-              <menuitem label="&reportForm.problem_type.item3_2.title;" value="3_2"/>
-              <menuitem label="&reportForm.problem_type.item3_3.title;" value="3_3"/>
-              <menuitem label="&reportForm.problem_type.item3_4.title;" value="3_4"/>
-              <menuitem label="&reportForm.problem_type.item3_5.title;" value="3_5"/>
+              <!-- ************* WARNING *************** -->
+              <!-- DO *NOT* Add/change/modify without consulting with r.m.o server admin first! -->
+              <!-- ************ /WARNING *************** -->
+              <menuitem label="&reportForm.problem_type.chooseOne.title;" value="0"/>
+              <menuitem label="&reportForm.problem_type.item1.title;" value="1"/>
+              <menuitem label="&reportForm.problem_type.item2.title;" value="2"/>
+              <menuitem label="&reportForm.problem_type.item3.title;" value="3"/>
+              <menuitem label="&reportForm.problem_type.item4.title;" value="4"/>
+              <menuitem label="&reportForm.problem_type.item5.title;" value="5"/>
+              <menuitem label="&reportForm.problem_type.item6.title;" value="6"/>
+              <menuitem label="&reportForm.problem_type.item7.title;" value="7"/>
             </menupopup>
           </menulist>
         </row>