diff --git a/includes/about_menu.php b/includes/about_menu.php
index 86377db..e06108f 100644
--- a/includes/about_menu.php
+++ b/includes/about_menu.php
@@ -8,12 +8,11 @@
 	<li><a href="/index.php?id=19"><?=_("Point System")?></a></li>
 	<li><a href="/policy/NRPDisclaimerAndLicence.php" target="_blank"><?=_("Disclaimer")?></a></li>
 	<li><a href="http://bugs.CAcert.org/"><?=_("Bug Database")?></a></li>
-<? //	<li><a href="/index.php?id=47">< ? = _ ("PR Materials" ) ? > </a></li>
-?>
-<!--	<li><a href="/logos.php"><?=_("CAcert Logos")?></a></li>-->
-	<li><a href="/stats.php"><?=_("CAcert Statistics")?></a></li>
+<? //	<li><a href="/index.php?id=47"><  = _ ("PR Materials" )  > </a></li> ?>
+<? //	<li><a href="/logos.php">< ? = _ ( " CAcert Logos " ) ? > </a></li> ?>
+<? if($_SESSION['mconn']) { ?>	<li><a href="/stats.php"><?=_("CAcert Statistics")?></a></li> <? } ?>
 	<li><a href="http://blog.CAcert.org/feed/"><?=_("RSS News Feed")?></a></li>
-<!--	<li><a href="/index.php?id=7"><?=_("Credits")?></a></li>-->
+<? //-	<li><a href="/index.php?id=7"> < ? = _ ( " Credits " ) ? > </a></li> ?>
 	<li><a href="/index.php?id=8"><?=_("CAcert Board")?></a></li>
 	<li><a href="https://lists.cacert.org/cgi-bin/mailman/listinfo"><?=_("Mailing Lists")?></a></li>
 	<li><a href="/src-lic.php"><?=_("Sourcecode")?></a></li>
diff --git a/includes/account.php b/includes/account.php
index 538870c..03abea0 100644
--- a/includes/account.php
+++ b/includes/account.php
@@ -29,6 +29,13 @@
 	$domid=0; if(array_key_exists('domid',$_REQUEST)) $domid=intval($_REQUEST['domid']);
 
 
+	if(!$_SESSION['mconn'])
+	{
+		echo _("Several CAcert Services are currently unavailable. Please try again later.");
+		exit;
+	}
+
+
 	if($id == 45 || $id == 46 || $oldid == 45 || $oldid == 46)
 	{
 		$id = 1;
diff --git a/includes/general_stuff.php b/includes/general_stuff.php
index 3a71814..d4d75fe 100644
--- a/includes/general_stuff.php
+++ b/includes/general_stuff.php
@@ -42,10 +42,13 @@ google_color_border = "FFFFFF";
   <div id="pageNav">
     <div class="relatedLinks">
       <h3><?=_("Join CAcert.org")?></h3>
+      <? if($_SESSION['mconn']) { ?>
       <a href="https://<?=$_SESSION['_config']['normalhostname']?>/index.php?id=1"><?=_("Join")?></a>
+      <? } ?>
       <a href="/policy/CAcertCommunityAgreement.php"><?=_("Community Agreement ")?></a>
       <a href="index.php?id=3"><?=_("Root Certificate")?></a>
     </div>
+    <? if($_SESSION['mconn']) { ?>
     <div class="relatedLinks">
       <h3><?=_("My Account")?></h3>
       <a href="https://<?=$_SESSION['_config']['normalhostname']?>/index.php?id=4"><?=_("Password Login")?></a> 
@@ -53,11 +56,13 @@ google_color_border = "FFFFFF";
       <a href="https://<?=$_SESSION['_config']['normalhostname']?>/index.php?id=4&amp;noauto=1"><?=_("Net Cafe Login")?></a> 
       <a href="https://<?=$_SESSION['_config']['securehostname']?>/index.php?id=4"><?=_("Certificate Login")?></a>
     </div>
+    <? } ?>
     <? include("about_menu.php"); ?>
     <div class="relatedLinks">
       <h3 onclick="explode('trans')">+ <?=_("Translations")?></h3>
       <ul class="menu" id="trans"><? foreach($_SESSION['_config']['translations'] as $key => $val) { ?><li><a href="<?=$_SERVER['SCRIPT_NAME']?>?id=<?=intval(array_key_exists('id',$_REQUEST)?$_REQUEST['id']:0)?>&amp;lang=<?=$key?>"><?=$val?></a></li><? } ?></ul>
     </div>
+    <? if($_SESSION['mconn']) { ?>
     <div class="relatedLinks">
       <h3 onclick="explode('recom')"><?=_("Advertising")?></h3>
       <ul class="menu" id="recom"><?
@@ -67,6 +72,7 @@ google_color_border = "FFFFFF";
 		echo "<li><a href='$row[link]' target='_blank'>$row[title]</a></li>";
 ?></ul>
     </div>
+    <? } ?>
   </div>
   <div id="content">
     <div class="story">