diff --git a/webtools/bugzilla/CGI.pl b/webtools/bugzilla/CGI.pl
index 76b88d452122..b2316d555d96 100644
--- a/webtools/bugzilla/CGI.pl
+++ b/webtools/bugzilla/CGI.pl
@@ -61,10 +61,7 @@ use vars qw($template $vars);
 # this message, of course, since it needs to be available in order for
 # the administrator to open Bugzilla back up.
 if (Param("shutdownhtml") && $0 !~ m:[\\/](do)?editparams.cgi$:) {
-    # The shut down message we are going to display to the user.
-    $::vars->{'title'} = "Bugzilla is Down";
-    $::vars->{'h1'} = "Bugzilla is Down";
-    $::vars->{'message'} = Param("shutdownhtml");
+    $::vars->{'message'} = "shutdown";
     
     # Return the appropriate HTTP response headers.
     print "Content-Type: text/html\n\n";
diff --git a/webtools/bugzilla/template/en/default/global/messages.html.tmpl b/webtools/bugzilla/template/en/default/global/messages.html.tmpl
index 559bd5edf399..d08bd21bb22c 100644
--- a/webtools/bugzilla/template/en/default/global/messages.html.tmpl
+++ b/webtools/bugzilla/template/en/default/global/messages.html.tmpl
@@ -252,6 +252,10 @@
     intentionally cleared out the "Reassign bug to" 
     field, [% Param("browserbugmessage") %]
 
+  [% ELSIF message_tag == "shutdown" %]
+    [% title = "Bugzilla is Down" %]
+    [% Param("shutdownhtml") %]
+    
   [% ELSIF message_tag == "unknown_keyword" %]
     [% title = "Unknown Keyword" %]
     <code>[% keyword FILTER html %]</code> is not a known keyword.