diff --git a/emailadmin/inc/class.defaultsmtp.inc.php b/emailadmin/inc/class.defaultsmtp.inc.php
index 75b6606cf8..d7fb027e11 100644
--- a/emailadmin/inc/class.defaultsmtp.inc.php
+++ b/emailadmin/inc/class.defaultsmtp.inc.php
@@ -20,43 +20,43 @@
 
 		/**
 		 * SmtpServerId
-		 * 
+		 *
 		 * @var int
 		 */
 		var $SmtpServerId;
 
 		var $smtpAuth = false;
-		
-		var $editForwardingAddress = false;		
+
+		var $editForwardingAddress = false;
 
 		var $host;
-		
+
 		var $port;
-		
+
 		var $username;
-		
+
 		var $password;
-		
+
 		var $defaultDomain;
-		
+
 		// the constructor
 		function defaultsmtp($defaultDomain=null)
 		{
 			$this->defaultDomain = $defaultDomain ? $defaultDomain : $GLOBALS['egw_info']['server']['mail_suffix'];
 		}
-		
+
 		// add a account
 		function addAccount($_hookValues)
 		{
 			return true;
 		}
-		
+
 		// delete a account
 		function deleteAccount($_hookValues)
 		{
 			return true;
 		}
-		
+
 		function getAccountEmailAddress($_accountName)
 		{
 			$accountID = $GLOBALS['egw']->accounts->name2id($_accountName);
@@ -64,12 +64,12 @@
 			if(empty($emailAddress))
 				$emailAddress = $_accountName.'@'.$this->defaultDomain;
 
-			$realName = trim($GLOBALS['egw_info']['user']['firstname'] . (!empty($GLOBALS['egw_info']['user']['firstname']) ? ' ' : '') . $GLOBALS['egw_info']['user']['lastname']);
+			$realName = trim($GLOBALS['egw_info']['user']['account_firstname'] . (!empty($GLOBALS['egw_info']['user']['account_firstname']) ? ' ' : '') . $GLOBALS['egw_info']['user']['account_lastname']);
 
 			return array(
 				array(
-					'name'		=> $realName, 
-					'address'	=> $emailAddress, 
+					'name'		=> $realName,
+					'address'	=> $emailAddress,
 					'type'		=> 'default'
 				)
 			);
@@ -77,7 +77,7 @@
 
 		function getUserData($_uidnumber) {
 			$userData = array();
-			
+
 			return $userData;
 		}
 
@@ -88,7 +88,7 @@
 		function setUserData($_uidnumber, $_mailAlternateAddress, $_mailForwardingAddress, $_deliveryMode) {
 			return true;
 		}
-		
+
 		// update a account
 		function updateAccount($_hookValues) {
 			return true;
diff --git a/emailadmin/inc/class.emailadmin_smtp_ldap.inc.php b/emailadmin/inc/class.emailadmin_smtp_ldap.inc.php
index 03887ab3a6..960cceae54 100644
--- a/emailadmin/inc/class.emailadmin_smtp_ldap.inc.php
+++ b/emailadmin/inc/class.emailadmin_smtp_ldap.inc.php
@@ -178,7 +178,7 @@ class emailadmin_smtp_ldap extends defaultsmtp
 
 		if ($sri)
 		{
-			$realName = trim($GLOBALS['egw_info']['user']['firstname'] . (!empty($GLOBALS['egw_info']['user']['firstname']) ? ' ' : '') . $GLOBALS['egw_info']['user']['lastname']);
+			$realName = trim($GLOBALS['egw_info']['user']['account_firstname'] . (!empty($GLOBALS['egw_info']['user']['account_firstname']) ? ' ' : '') . $GLOBALS['egw_info']['user']['account_lastname']);
 			$allValues = ldap_get_entries($ds, $sri);
 
 			if(isset($allValues[0]['mail']))