diff --git a/install/patches/upd_0094.php b/install/patches/upd_0094.php
index b9516e232e99506f6f451d27a8d50253b6b623f1..e05f85b7bc06d31aa19529e49ba65f211223ad3e 100644
--- a/install/patches/upd_0094.php
+++ b/install/patches/upd_0094.php
@@ -8,7 +8,7 @@ class upd_0094 extends installer_patch_update {
 		global $inst;
 
 		// Remove any duplicate mail_forwardings prior to adding unique key
-		$inst->db->query("DELETE FROM mail_forwarding WHERE forwarding_id IN (SELECT forwarding_id FROM (SELECT forwarding_id, COUNT(source) AS source_count FROM mail_forwarding GROUP BY source HAVING source_count > 1) as t1)");
+		//$inst->db->query("DELETE FROM mail_forwarding WHERE forwarding_id IN (SELECT forwarding_id FROM (SELECT forwarding_id, COUNT(source) AS source_count FROM mail_forwarding GROUP BY source HAVING source_count > 1) as t1)");
 	}
 
 }
diff --git a/install/sql/incremental/upd_dev_collection.sql b/install/sql/incremental/upd_dev_collection.sql
index 2400ca907a96c706f7f8b70b0231f165db3cb488..4cd5f31dfb221f5ee4e88a246c745aa7bb3ccd82 100644
--- a/install/sql/incremental/upd_dev_collection.sql
+++ b/install/sql/incremental/upd_dev_collection.sql
@@ -7,7 +7,7 @@ ALTER TABLE `spamfilter_users` ALTER `policy_id` SET DEFAULT 0;
 
 -- mail_forwarding.source must be unique
 ALTER TABLE `mail_forwarding` DROP KEY `server_id`;
-ALTER TABLE `mail_forwarding` ADD UNIQUE KEY `server_id` (`server_id`, `source`);
+ALTER TABLE `mail_forwarding` ADD KEY `server_id` (`server_id`, `source`);
 
 -- Purge apps & addons installer (#5795) - second time due to syntax error in 0093
 DROP TABLE IF EXISTS `software_package`;
diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql
index e37bef7f28364af45b30f616e71e3c5330cec424..11ff65ed1bae998b3a5177826a7fe232db47c1b7 100644
--- a/install/sql/ispconfig3.sql
+++ b/install/sql/ispconfig3.sql
@@ -918,7 +918,7 @@ CREATE TABLE `mail_forwarding` (
   `allow_send_as` ENUM('n','y') NOT NULL DEFAULT 'n',
   `greylisting` enum('n','y' ) NOT NULL DEFAULT 'n',
   PRIMARY KEY  (`forwarding_id`),
-  UNIQUE KEY `server_id` (`server_id`, `source`),
+  KEY `server_id` (`server_id`, `source`),
   KEY `type` (`type`)
 ) DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
 
diff --git a/interface/web/mail/form/mail_alias.tform.php b/interface/web/mail/form/mail_alias.tform.php
index 39b485c7a5991fca5a1f2e3db1187b3654e6eca7..9434ba3eecc080c588fc8527974805bf0ba73c44 100644
--- a/interface/web/mail/form/mail_alias.tform.php
+++ b/interface/web/mail/form/mail_alias.tform.php
@@ -83,8 +83,6 @@ $form["tabs"]['alias'] = array (
 			),
 			'validators' => array (  0 => array ( 'type' => 'ISEMAIL',
 					'errmsg'=> 'email_error_isemail'),
-				1 => array ( 'type' => 'UNIQUE',
-					'errmsg'=> 'email_error_unique'),
 			),
 			'default' => '',
 			'value'  => '',
diff --git a/interface/web/mail/form/mail_forward.tform.php b/interface/web/mail/form/mail_forward.tform.php
index db940f035ef7a7901f14070ce80afa002db56dc6..003e678455ec6929921bd333f31e9546c0600fd2 100644
--- a/interface/web/mail/form/mail_forward.tform.php
+++ b/interface/web/mail/form/mail_forward.tform.php
@@ -83,8 +83,6 @@ $form["tabs"]['forward'] = array (
 			),
 			'validators' => array (  0 => array ( 'type' => 'ISEMAIL',
 					'errmsg'=> 'email_error_isemail'),
-				1 => array ( 'type' => 'UNIQUE',
-					'errmsg'=> 'email_error_unique'),
 			),
 			'default' => '',
 			'value'  => '',