diff --git a/emailadmin/setup/setup.inc.php b/emailadmin/setup/setup.inc.php
index 36bbd137e5..7a6a928da9 100644
--- a/emailadmin/setup/setup.inc.php
+++ b/emailadmin/setup/setup.inc.php
@@ -13,7 +13,7 @@
 
 $setup_info['emailadmin']['name']      = 'emailadmin';
 $setup_info['emailadmin']['title']     = 'EMailAdmin';
-$setup_info['emailadmin']['version']   = '14.1';
+$setup_info['emailadmin']['version']   = '14.2';
 $setup_info['emailadmin']['app_order'] = 10;
 $setup_info['emailadmin']['enable']    = 2;
 
diff --git a/emailadmin/setup/tables_current.inc.php b/emailadmin/setup/tables_current.inc.php
index 5843daaaf2..f49ec50a5c 100644
--- a/emailadmin/setup/tables_current.inc.php
+++ b/emailadmin/setup/tables_current.inc.php
@@ -148,8 +148,8 @@ $phpgw_baseline = array(
 		),
 		'pk' => array(),
 		'fk' => array(),
-		'ix' => array(array('acc_id','account_id'),array('account_id','acc_id')),
-		'uc' => array()
+		'ix' => array(array('account_id','acc_id')),
+		'uc' => array(array('acc_id','account_id'))
 	),
 	'egw_ea_notifications' => array(
 		'fd' => array(
diff --git a/emailadmin/setup/tables_update.inc.php b/emailadmin/setup/tables_update.inc.php
index e8f8f88aa5..15590f9b8f 100644
--- a/emailadmin/setup/tables_update.inc.php
+++ b/emailadmin/setup/tables_update.inc.php
@@ -882,3 +882,12 @@ function emailadmin_upgrade1_9_019()
 {
 	return $GLOBALS['setup_info']['emailadmin']['currentver'] = '14.1';
 }
+
+
+function emailadmin_upgrade14_1()
+{
+	$GLOBALS['egw_setup']->oProc->DropIndex('egw_ea_valid', array('acc_id', 'account_id'));
+	$GLOBALS['egw_setup']->oProc->CreateIndex('egw_ea_valid', array('acc_id', 'account_id'), true);
+
+	return $GLOBALS['setup_info']['emailadmin']['currentver'] = '14.2';
+}