diff --git a/phpgwapi/inc/class.datetime.inc.php b/phpgwapi/inc/class.datetime.inc.php
index dbf8ad883c..c0d8d583de 100755
--- a/phpgwapi/inc/class.datetime.inc.php
+++ b/phpgwapi/inc/class.datetime.inc.php
@@ -25,9 +25,9 @@
 
 	/* $Id$ */
 
-	$d1 = strtolower(substr($phpgw_info['server']['api_inc'],0,3));
-	$d2 = strtolower(substr($phpgw_info['server']['server_root'],0,3));
-	$d3 = strtolower(substr($phpgw_info['server']['app_inc'],0,3));
+	$d1 = strtolower(@substr(PHPGW_API_INC,0,3));
+	$d2 = strtolower(@substr(PHPGW_SERVER_ROOT,0,3));
+	$d3 = strtolower(@substr(PHPGW_APP_INC,0,3));
 	if($d1 == 'htt' || $d1 == 'ftp' || $d2 == 'htt' || $d2 == 'ftp' || $d3 == 'htt' || $d3 == 'ftp')
 	{
 		echo 'Failed attempt to break in via an old Security Hole!<br>'."\n";
diff --git a/phpgwapi/inc/class.phpgw.inc.php b/phpgwapi/inc/class.phpgw.inc.php
index 15a8d3aa53..64e1ef1b65 100644
--- a/phpgwapi/inc/class.phpgw.inc.php
+++ b/phpgwapi/inc/class.phpgw.inc.php
@@ -120,7 +120,7 @@
 		{
 			global $HTTP_ENV_VARS;
 
-			$iis = strpos($HTTP_ENV_VARS["SERVER_SOFTWARE"], "IIS", 0);
+			$iis = @strpos($HTTP_ENV_VARS["SERVER_SOFTWARE"], "IIS", 0);
 			
 			if ( !$url ) {
 				$url = $PHP_SELF;
diff --git a/phpgwapi/inc/class.sessions.inc.php b/phpgwapi/inc/class.sessions.inc.php
index 1923a24532..d4573ba2dd 100644
--- a/phpgwapi/inc/class.sessions.inc.php
+++ b/phpgwapi/inc/class.sessions.inc.php
@@ -97,7 +97,7 @@
 			$login_array = explode('@', $db->f('session_lid'));
 			$this->account_lid = $login_array[0];
 
-			if ($login_array[1] != '')
+			if (@$login_array[1] != '')
 			{
 				$this->account_domain = $login_array[1];
 			}
@@ -112,7 +112,7 @@
 			$phpgw_info['flags'] = $phpgw_info_flags;
 			$userid_array = explode('@',$db->f('session_lid'));
 // Thinking this might solve auth_http	problems
-			if($userid_array[1] == '') { $userid_array[1] = 'default'; }
+			if(@$userid_array[1] == '') { $userid_array[1] = 'default'; }
 			$this->account_lid = $userid_array[0];
 			$this->update_dla();
 			$this->account_id = $phpgw->accounts->name2id($this->account_lid);
@@ -347,7 +347,7 @@
 			$this->user['account_id']  = $this->account_id;
 			$this->user['account_lid'] = $this->account_lid;
 			$this->user['userid']      = $this->account_lid;
-			$this->user['passwd']      = $this->passwd;
+			$this->user['passwd']      = @$this->passwd;
 			$this->hooks               = $phpgw->hooks->read();
 		}
 	
@@ -533,9 +533,9 @@
 			}
 			else
 			{
-				$url .= '?sessionid=' . $phpgw_info['user']['sessionid'];
+				$url .= '?sessionid=' . @$phpgw_info['user']['sessionid'];
 				$url .= '&kp3=' . $kp3;
-				$url .= '&domain=' . $phpgw_info['user']['domain'];
+				$url .= '&domain=' . @$phpgw_info['user']['domain'];
 				// This doesn't belong in the API.
 				// Its up to the app to pass this value. (jengo)
 				// Putting it into the app requires a massive number of updates in email app. 
diff --git a/phpgwapi/inc/functions.inc.php b/phpgwapi/inc/functions.inc.php
index 4212437eed..01c714668d 100644
--- a/phpgwapi/inc/functions.inc.php
+++ b/phpgwapi/inc/functions.inc.php
@@ -107,7 +107,7 @@
 		{
 			if ($default_id == '')
 			{
-				return $phpgw_info['user']['account_id'];
+				return (isset($phpgw_info['user']['account_id'])?$phpgw_info['user']['account_id']:0);
 			}
 			elseif (gettype($default_id) == 'string')
 			{
@@ -215,7 +215,7 @@
 		}
 	}
 
-	if (isset($phpgw_domain[$phpgw_info['user']['domain']]))
+	if (@isset($phpgw_domain[$phpgw_info['user']['domain']]))
 	{
 		$phpgw_info['server']['db_host'] = $phpgw_domain[$phpgw_info['user']['domain']]['db_host'];
 		$phpgw_info['server']['db_name'] = $phpgw_domain[$phpgw_info['user']['domain']]['db_name'];
@@ -238,7 +238,7 @@
 	}
 	unset ($domain); // we kill this to save memory
 
-	print_debug('domain: '.$phpgw_info['user']['domain']);
+	@print_debug('domain: '.$phpgw_info['user']['domain']);
 
 	/****************************************************************************\
 	* These lines load up the API, fill up the $phpgw_info array, etc            *
@@ -308,7 +308,7 @@
 	{
 		if ($phpgw_info['flags']['currentapp'] == 'login')
 		{
-			if ($login != '')
+			if (@$login != '')
 			{
 				$login_array = explode("@",$login);
 				$login_id = $phpgw->accounts->name2id($login_array[0]);
@@ -337,7 +337,7 @@
 		define('PHPGW_APP_INC', $phpgw->common->get_inc_dir());
 		define('PHPGW_APP_TPL', $phpgw->common->get_tpl_dir());
 		define('PHPGW_IMAGES', $phpgw->common->get_image_path());
-		define('PHPGW_IMAGES_DIR', $phpgw->common->get_image_dir());
+		define('PHPGW_APP_IMAGES_DIR', $phpgw->common->get_image_dir());
 		define('PHPGW_ACL_READ',1);
 		define('PHPGW_ACL_ADD',2);
 		define('PHPGW_ACL_EDIT',4);