diff --git a/e107_plugins/login_menu/login_menu_shortcodes.php b/e107_plugins/login_menu/login_menu_shortcodes.php
index 2dfd3a764..926f637c3 100755
--- a/e107_plugins/login_menu/login_menu_shortcodes.php
+++ b/e107_plugins/login_menu/login_menu_shortcodes.php
@@ -3,20 +3,20 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     ©Steve Dunstan 2001-2002
+|     Copyright (C) 2001-2009 e107 Inc
 |     http://e107.org
-|     jalist@e107.org
+|
 |
 |     Released under the terms and conditions of the
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_plugins/login_menu/login_menu_shortcodes.php,v $
-|     $Revision: 1.8 $
-|     $Date: 2009-08-23 10:57:51 $
+|     $Revision: 1.9 $
+|     $Date: 2009-10-28 14:14:10 $
 |     $Author: marj_nl_fr $
 +----------------------------------------------------------------------------+
 */
-if (!defined('e107_INIT')) { exit; }
+if (!defined('e107_INIT')) { exit(); }
 global $tp;
 $login_menu_shortcodes = $tp -> e_sc -> parse_scbatch(__FILE__);
 /*
@@ -132,8 +132,9 @@ SC_END
 
 SC_BEGIN LM_MAINTENANCE
 global $pref;
-if(ADMIN == TRUE){
-	return ($pref['maintainance_flag'] == 1 ? LOGIN_MENU_L10 : '' );
+if(ADMIN && varset($pref['maintainance_flag']))
+{
+	return LOGIN_MENU_L10;
 }
 return '';
 SC_END
diff --git a/sitedown.php b/sitedown.php
index 2d8d7a4f0..5d61e1a90 100644
--- a/sitedown.php
+++ b/sitedown.php
@@ -11,23 +11,23 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/sitedown.php,v $
-|     $Revision: 1.5 $
-|     $Date: 2009-10-24 08:45:43 $
+|     $Revision: 1.6 $
+|     $Date: 2009-10-28 14:14:11 $
 |     $Author: marj_nl_fr $
 +----------------------------------------------------------------------------+
 */
 require_once('class2.php');
 
-header('Content-type: text/html; charset=utf-8', TRUE);
-
-include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_'.e_PAGE);
-
-if (!$pref['maintainance_flag'] )
+if (!varset($pref['maintainance_flag']))
 {
 	header('location: '.SITEURL);
 	exit();
 }
 
+header('Content-type: text/html; charset=utf-8', TRUE);
+
+include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_'.e_PAGE);
+
 require_once(e_FILE.'shortcode/batch/sitedown_shortcodes.php');
 
 if (!$SITEDOWN_TABLE)
@@ -41,5 +41,4 @@ if (!$SITEDOWN_TABLE)
 		require_once(e_THEME.'templates/sitedown_template.php');
 	}
 }
-
 echo $tp->parseTemplate($SITEDOWN_TABLE, TRUE, $sitedown_shortcodes);