diff --git a/phpgwapi/inc/class.setup.inc.php b/phpgwapi/inc/class.setup.inc.php
index 7944c00398..6302639fc6 100644
--- a/phpgwapi/inc/class.setup.inc.php
+++ b/phpgwapi/inc/class.setup.inc.php
@@ -110,7 +110,7 @@
 			elseif(!empty($ConfigLogin) && $auth_type == 'Config')
 			{
 				/* config login */
-				if($FormPW == $GLOBALS['phpgw_domain'][$FormDomain]['config_passwd'])
+				if($FormPW == @$GLOBALS['phpgw_domain'][$FormDomain]['config_passwd'])
 				{
 					setcookie('ConfigPW',"$FormPW","$expire");
 					setcookie('ConfigDomain',"$FormDomain","$expire");
@@ -215,6 +215,7 @@
 		*/
 		function clear_session_cache()
 		{
+			$tables = Array();
 			$tablenames = @$this->db->table_names();
 			while(list($key,$val) = @each($tablenames))
 			{
diff --git a/phpgwapi/inc/class.setup_detection.inc.php b/phpgwapi/inc/class.setup_detection.inc.php
index f2366374ea..cacddbd4a0 100644
--- a/phpgwapi/inc/class.setup_detection.inc.php
+++ b/phpgwapi/inc/class.setup_detection.inc.php
@@ -40,6 +40,7 @@
 
 		function get_db_versions($setup_info='')
 		{
+			$tname = Array();
 			$GLOBALS['phpgw_setup']->db->Halt_On_Error = 'no';
 			$tables = $GLOBALS['phpgw_setup']->db->table_names();
 			while(list($key,$val) = @each($tables))
diff --git a/phpgwapi/inc/class.setup_html.inc.php b/phpgwapi/inc/class.setup_html.inc.php
index 594d812e74..dff8a5e49a 100644
--- a/phpgwapi/inc/class.setup_html.inc.php
+++ b/phpgwapi/inc/class.setup_html.inc.php
@@ -133,8 +133,8 @@
 		function login_form()
 		{
 			/* begin use TEMPLATE login_main.tpl */
-			$GLOBALS['setup_tpl']->set_var('ConfigLoginMSG',$GLOBALS['phpgw_info']['setup']['ConfigLoginMSG']);
-			$GLOBALS['setup_tpl']->set_var('HeaderLoginMSG',$GLOBALS['phpgw_info']['setup']['HeaderLoginMSG']);
+			$GLOBALS['setup_tpl']->set_var('ConfigLoginMSG',@$GLOBALS['phpgw_info']['setup']['ConfigLoginMSG']);
+			$GLOBALS['setup_tpl']->set_var('HeaderLoginMSG',@$GLOBALS['phpgw_info']['setup']['HeaderLoginMSG']);
 
 			if ($GLOBALS['phpgw_info']['setup']['stage']['header'] == '10')
 			{