diff --git a/mozilla/webtools/bugzilla/CGI.pl b/mozilla/webtools/bugzilla/CGI.pl
index bbc5863ede3..c12ce8e5e7c 100644
--- a/mozilla/webtools/bugzilla/CGI.pl
+++ b/mozilla/webtools/bugzilla/CGI.pl
@@ -320,7 +320,7 @@ sub CheckEmailSyntax {
     if ($addr !~ /$match/) {
         print "Content-type: text/html\n\n";
 
-        print "<H1>Invalid e-mail address entered.</H1>\n";
+        PutHeader("Check e-mail syntax");
         print "The e-mail address you entered\n";
         print "(<b>$addr</b>) didn't match our minimal\n";
         print "syntax checking for a legal email address.\n";
@@ -358,7 +358,7 @@ To use the wonders of bugzilla, you can use the following:
     close SENDMAIL;
 
     print "Content-type: text/html\n\n";
-    print "<H1>Password has been emailed.</H1>\n";
+    PutHeader("Password mailed");
     print "The password for the e-mail address\n";
     print "$login has been e-mailed to that address.\n";
     print "<p>When the e-mail arrives, you can click <b>Back</b>\n";
@@ -427,7 +427,7 @@ sub confirm_login {
 
     if ($loginok != 1) {
         print "Content-type: text/html\n\n";
-        print "<H1>Please log in.</H1>\n";
+        PutHeader("Login");
         print "I need a legitimate e-mail address and password to continue.\n";
         if (!defined $nexturl || $nexturl eq "") {
 	    # Sets nexturl to be argv0, stripping everything up to and
diff --git a/mozilla/webtools/bugzilla/colchange.cgi b/mozilla/webtools/bugzilla/colchange.cgi
index 33d2dfe7057..2dd1b350b8c 100755
--- a/mozilla/webtools/bugzilla/colchange.cgi
+++ b/mozilla/webtools/bugzilla/colchange.cgi
@@ -63,6 +63,7 @@ if (defined $::FORM{'rememberedquery'}) {
     print "Refresh: 0; URL=buglist.cgi?$::FORM{'rememberedquery'}\n";
     print "\n";
     print "<TITLE>What a hack.</TITLE>\n";
+    PutHeader ("Change columns");
     print "Resubmitting your query with new columns...\n";
     exit;
 }
@@ -84,6 +85,7 @@ $desc{'summaryfull'} = "Full Summary";
 
 
 print "\n";
+PutHeader ("Change columns");
 print "Check which columns you wish to appear on the list, and then click\n";
 print "on submit.\n";
 print "<p>\n";
diff --git a/mozilla/webtools/bugzilla/long_list.cgi b/mozilla/webtools/bugzilla/long_list.cgi
index 69546119fad..e855c443422 100755
--- a/mozilla/webtools/bugzilla/long_list.cgi
+++ b/mozilla/webtools/bugzilla/long_list.cgi
@@ -29,7 +29,7 @@ require "CGI.pl";
 use vars %::FORM;
 
 print "Content-type: text/html\n\n";
-print "<TITLE>Full Text Bug Listing</TITLE>\n";
+PutHeader ("Full Text Bug Listing");
 
 ConnectToDatabase();
 quietly_check_login();
diff --git a/mozilla/webtools/bugzilla/process_bug.cgi b/mozilla/webtools/bugzilla/process_bug.cgi
index 297a9ed77a2..aa168bd55d8 100755
--- a/mozilla/webtools/bugzilla/process_bug.cgi
+++ b/mozilla/webtools/bugzilla/process_bug.cgi
@@ -34,6 +34,8 @@ confirm_login();
 
 print "Content-type: text/html\n\n";
 
+PutHeader ("Bug processed");
+
 GetVersionTable();
 
 if ($::FORM{'product'} ne $::dontchange) {
diff --git a/mozilla/webtools/bugzilla/relogin.cgi b/mozilla/webtools/bugzilla/relogin.cgi
index d1e2700aa71..a62577ca652 100755
--- a/mozilla/webtools/bugzilla/relogin.cgi
+++ b/mozilla/webtools/bugzilla/relogin.cgi
@@ -30,7 +30,10 @@ Set-Cookie: Bugzilla_logincookie= ; path=/; expires=Sun, 30-Jun-80 00:00:00 GMT
 Set-Cookie: Bugzilla_password= ; path=/; expires=Sun, 30-Jun-80 00:00:00 GMT
 Content-type: text/html
 
-<H1>Your login has been forgotten.</H1>
+";
+PutHeader ("Relogin");
+
+print "<B>Your login has been forgotten</B>.</P>
 The cookie that was remembering your login is now gone.  The next time you
 do an action that requires a login, you will be prompted for it.
 <p>