1 files changed, 7 insertions, 2 deletions
diff --git a/index.php b/index.php
index 81d089dfb..895e439ea 100644
--- a/index.php
+++ b/index.php
@@ -31,9 +31,12 @@ $a->init_pagehead();
 session_start();
 
 
-if((x($_SESSION,'authenticated')) || (x($_POST['auth-params'])))
+if((x($_SESSION,'authenticated')) || (x($_POST,'auth-params')))
 	require("auth.php");
 
+if(! x($_SESSION,'sysmsg'))
+	$_SESSION['sysmsg'] = '';
+
 if($install)
 	$a->module = 'install';
 else
@@ -71,7 +74,9 @@ if($a->module_loaded) {
 
 	if((! $a->error) && (function_exists($a->module . '_content'))) {
 		$func = $a->module . '_content';
-      		$a->page['content'] .= $func($a);
+		if(! x($a->page,'content'))
+			$a->page['content'] = '';
+		$a->page['content'] .= $func($a);
 	}
 
 }