diff --git a/setup/inc/hook_config_validate.inc.php b/setup/inc/hook_config_validate.inc.php
index 7a187d3914..657a4ad71c 100644
--- a/setup/inc/hook_config_validate.inc.php
+++ b/setup/inc/hook_config_validate.inc.php
@@ -24,9 +24,9 @@
 		{
 			$GLOBALS['config_error'] = lang('Missing or uncomplete mailserver configuration');
 		}
-		if (@file_exists('../emailadmin/inc/class.bo.inc.php') && $GLOBALS['egw_setup']->table_exist(array('egw_emailadmin')) || true)
+		if (@file_exists('../emailadmin/inc/class.emailadmin_bo.inc.php') && $GLOBALS['egw_setup']->table_exist(array('egw_emailadmin')) || true)
 		{
-			$emailadmin =& CreateObject('emailadmin.bo',-1,false);	// false=no session stuff
+			$emailadmin = new emailadmin.bo(-1,false);	// false=no session stuff
 			if (is_object($emailadmin))
 			{
 				$emailadmin->setDefaultProfile($settings);
diff --git a/setup/setup-cli.php b/setup/setup-cli.php
index 9f6fbbd149..7b4b07c81e 100755
--- a/setup/setup-cli.php
+++ b/setup/setup-cli.php
@@ -189,7 +189,7 @@ function do_emailadmin()
 	}
 	$config['smtpAuth'] = $config['smtp_auth_user'] ? 'yes' : null;
 
-	$emailadmin =& CreateObject('emailadmin.bo',-1,false);	// false=no session stuff
+	$emailadmin = new emailadmin_bo(-1,false);	// false=no session stuff
 	$emailadmin->setDefaultProfile($config);
 	
 	echo "\n".lang('EMailAdmin profile updated:')."\n";