diff --git a/admin/inc/class.uiasyncservice.inc.php b/admin/inc/class.uiasyncservice.inc.php
index 6cbdf38d11..beee52285b 100644
--- a/admin/inc/class.uiasyncservice.inc.php
+++ b/admin/inc/class.uiasyncservice.inc.php
@@ -55,11 +55,11 @@ class uiasyncservice
 
 			if ($_POST['test'])
 			{
-				if (strpos($GLOBALS['egw_info']['user']['email'],'@') === false)
+				if (strpos($GLOBALS['egw_info']['user']['account_email'],'@') === false)
 				{
 					echo '<p><b>'.lang("You have no email address for your user set !!!")."</b></p>\n";
 				}
-				elseif (!$async->set_timer($times,'test','admin.uiasyncservice.test',(array)$GLOBALS['egw_info']['user']['email']))
+				elseif (!$async->set_timer($times,'test','admin.uiasyncservice.test',(array)$GLOBALS['egw_info']['user']['account_email']))
 				{
 					echo '<p><b>'.lang("Error setting timer, wrong syntax or maybe there's one already running !!!")."</b></p>\n";
 				}
diff --git a/emailadmin/inc/class.smtpplesk.inc.php b/emailadmin/inc/class.smtpplesk.inc.php
index 01c67f7b6e..7f28d27016 100644
--- a/emailadmin/inc/class.smtpplesk.inc.php
+++ b/emailadmin/inc/class.smtpplesk.inc.php
@@ -81,8 +81,8 @@ class smtpplesk extends defaultsmtp
 		//echo "<p>smtpplesk::getAccountEmailAddress()</p>\n";
 
 		return array(array(
-			'name'		=> $GLOBALS['egw_info']['user']['fullname'],
-			'address'	=> $GLOBALS['egw_info']['user']['email'],
+			'name'		=> $GLOBALS['egw_info']['user']['account_fullname'],
+			'address'	=> $GLOBALS['egw_info']['user']['account_email'],
 			'type'		=> 'default'
 		));
 	}
diff --git a/phpgwapi/inc/class.preferences.inc.php b/phpgwapi/inc/class.preferences.inc.php
index 1bb112abd6..13af2f81b4 100644
--- a/phpgwapi/inc/class.preferences.inc.php
+++ b/phpgwapi/inc/class.preferences.inc.php
@@ -1113,7 +1113,7 @@ class preferences
 		// the user does not directly manipulate this pref for the default email account
 		if ((string)$acctnum == '0')
 		{
-			$prefs['email']['fullname'] = $GLOBALS['egw_info']['user']['fullname'];
+			$prefs['email']['fullname'] = $GLOBALS['egw_info']['user']['account_fullname'];
 		}
 
 		// = = = =  SIMPLER PREFS  = = = =
diff --git a/phpgwapi/inc/class.send.inc.php b/phpgwapi/inc/class.send.inc.php
index a04e34c5f7..4263ab6bc1 100644
--- a/phpgwapi/inc/class.send.inc.php
+++ b/phpgwapi/inc/class.send.inc.php
@@ -120,8 +120,8 @@ class send extends egw_mailer
 		$this->ClearAttachments();
 		$this->ClearCustomHeaders();
 
-		$this->FromName = $GLOBALS['egw_info']['user']['fullname'];
-		$this->From = $GLOBALS['egw_info']['user']['email'];
+		$this->FromName = $GLOBALS['egw_info']['user']['account_fullname'];
+		$this->From = $GLOBALS['egw_info']['user']['account_email'];
 		$this->Sender = '';
 
 		$this->AddCustomHeader('X-Mailer:eGroupWare (http://www.eGroupWare.org)');