diff --git a/felamimail/inc/class.felamimail_activesync.inc.php b/felamimail/inc/class.felamimail_activesync.inc.php
index 986ae2ca76..cba514abaa 100644
--- a/felamimail/inc/class.felamimail_activesync.inc.php
+++ b/felamimail/inc/class.felamimail_activesync.inc.php
@@ -158,11 +158,11 @@ class felamimail_activesync implements activesync_plugin_write, activesync_plugi
 		$identities = array();
 		if (!isset($params['setup']))
 		{
-			if (!$this->mail) $this->mail = felamimail_bo::getInstance(true,(self::$profileID=='G'?0:self::$profileID));
+			if (!$this->mail) $this->mail = felamimail_bo::getInstance(true,(self::$profileID=='G'?emailadmin_bo::getUserDefaultProfileID():self::$profileID));
 			$selectedID = $this->mail->getIdentitiesWithAccounts($identities);
 			if (self::$profileID=='G')
 			{
-				if (is_object($this->mail->mailPreferences)) $activeIdentity =& $this->mail->mailPreferences->getIdentity(0);
+				if (is_object($this->mail->mailPreferences)) $activeIdentity =& $this->mail->mailPreferences->getIdentity(emailadmin_bo::getUserDefaultProfileID());
 			}
 			else
 			{
diff --git a/felamimail/inc/class.felamimail_bo.inc.php b/felamimail/inc/class.felamimail_bo.inc.php
index 6f5296e0db..6fa6f2cab1 100644
--- a/felamimail/inc/class.felamimail_bo.inc.php
+++ b/felamimail/inc/class.felamimail_bo.inc.php
@@ -169,9 +169,10 @@ class felamimail_bo
 	{
 		if ($_profileID == 0)
 		{
-			$profileID = emailadmin_bo::getDefaultProfileID();
+			$profileID = emailadmin_bo::getUserDefaultProfileID();
 			if ($profileID!=$_profileID) $_restoreSession==false;
 			$_profileID=$profileID;
+			error_log(__METHOD__.__LINE__.' called with profileID==0 using '.$profileID.' instead->'.function_backtrace());
 		}
 		if ($_profileID != 0 && $_validate)
 		{