diff --git a/phpgwapi/inc/class.accounts_univention.inc.php b/phpgwapi/inc/class.accounts_univention.inc.php
index 669342b975..49b0f7e9f5 100644
--- a/phpgwapi/inc/class.accounts_univention.inc.php
+++ b/phpgwapi/inc/class.accounts_univention.inc.php
@@ -67,7 +67,7 @@ class accounts_univention extends accounts_ldap
 				// get_default() does not work for Adminstrator, try acc_id=1 instead
 				// if everything fails try hostname ...
 				try {
-					if (!($account = emailadmin_account::get_default()))
+					if (!($account = emailadmin_account::get_default(false, false, false)))
 					{
 						$account = emailadmin_account::read(1);
 					}
@@ -76,7 +76,7 @@ class accounts_univention extends accounts_ldap
 				catch(Exception $e) {
 					unset($e);
 				}
-				if (empty($hostname)) $hostname = trunc(system('hostname -f'));
+				if (empty($hostname)) $hostname = trim(system('hostname -f'));
 				$params[] = '--set'; $params[] = 'mailHomeServer='.$hostname;
 			}
 			$cmd = self::DIRECTORY_MANAGER_BIN.' '.implode(' ', array_map('escapeshellarg', $params));