diff --git a/mod.php b/mod.php
index af0d93f83..79afef31c 100644
--- a/mod.php
+++ b/mod.php
@@ -10,11 +10,21 @@
 $_SERVER['BASE_PAGE'] = 'mod.php';
 include_once $_SERVER['DOCUMENT_ROOT'] . '/include/prepend.inc';
 
-// Only run on www.php.net
-if ($MYSITE != "http://www.php.net/") { exit; }
-
 site_header("Email confirmation");
 
+// Only run on www.php.net
+if ($MYSITE != "http://www.php.net/") { 
+    echo <<<ERROR
+<h1>Email confirmation failed</h1>
+
+<p class="formerror">
+ This server is not capable of handling email confirmations.
+</p>
+ERROR;
+    site_footer();
+    exit;
+}
+
 // These sites are handled by automoderation
 $sites = array("php.net", "lists.php.net");
 
diff --git a/robots.txt b/robots.txt
index 18d182c53..dc94128b1 100644
--- a/robots.txt
+++ b/robots.txt
@@ -3,4 +3,5 @@ Disallow: /backend/
 Disallow: /stats/
 Disallow: /source.php
 Disallow: /search.php
+Disallow: /mod.php
 Disallow: /manual/add-note.php
diff --git a/search.php b/search.php
index 6cf786ac6..637fa2327 100644
--- a/search.php
+++ b/search.php
@@ -87,7 +87,7 @@ if (!empty($_FORM['pattern'])) {
 else {
 
     // Print out common header
-    site_header("Search", array("noindex"));
+    site_header("Search");
     if (isset($EXPL_LANG)) {
         $lang_input = "  <input type=\"hidden\" name=\"lang\" value=\"{$EXPL_LANG}\" />\n";
     } else {