diff --git a/mozilla/webtools/bugzilla/CGI.pl b/mozilla/webtools/bugzilla/CGI.pl
index 69a67b36b21..a5a4b3b1e30 100644
--- a/mozilla/webtools/bugzilla/CGI.pl
+++ b/mozilla/webtools/bugzilla/CGI.pl
@@ -270,6 +270,8 @@ sub navigation_header {
 }
 
 
+$::CheckOptionValues = 1;
+
 sub make_options {
     my ($src,$default,$isregexp) = (@_);
     my $last = "";
@@ -294,7 +296,7 @@ sub make_options {
         }
     }
     if (!$found && $default ne "") {
-      if ( Param("strictvaluechecks") && 
+      if ( Param("strictvaluechecks") && $::CheckOptionValues &&
            ($default ne $::dontchange) && ($default ne "-All-") &&
            ($default ne "DUPLICATE") ) {
         print "Possible bug database corruption has been detected.  " .
diff --git a/mozilla/webtools/bugzilla/query.cgi b/mozilla/webtools/bugzilla/query.cgi
index c7d49ace893..5cb40f147f6 100755
--- a/mozilla/webtools/bugzilla/query.cgi
+++ b/mozilla/webtools/bugzilla/query.cgi
@@ -26,6 +26,11 @@ use strict;
 
 require "CGI.pl";
 
+$::CheckOptionValues = 0;       # It's OK if we have some bogus things in the
+                                # pop-up lists here, from a remembered query
+                                # that is no longer quite valid.  We don't
+                                # want to crap out in the query page.
+
 # Shut up misguided -w warnings about "used only once":
 
 use vars @::legal_resolution,