diff --git a/install/dist/lib/fedora.lib.php b/install/dist/lib/fedora.lib.php
index c188ac93a5b32727d28b26e8709621e10193b77e..27962691f5a70ad3296ebc23c6144a31f915285a 100644
--- a/install/dist/lib/fedora.lib.php
+++ b/install/dist/lib/fedora.lib.php
@@ -154,7 +154,7 @@ class installer_dist extends installer_base {
 
 		$reject_sender_login_mismatch = '';
 		if(isset($server_ini_array['mail']['reject_sender_login_mismatch']) && ($server_ini_array['mail']['reject_sender_login_mismatch'] == 'y')) {
-			$reject_sender_login_mismatch = ', reject_authenticated_sender_login_mismatch';
+			$reject_sender_login_mismatch = ', reject_sender_login_mismatch';
 		}
 		unset($server_ini_array);
 
diff --git a/install/dist/lib/gentoo.lib.php b/install/dist/lib/gentoo.lib.php
index 324fe06e9adb2183cc7621216f6fe1ddfa93dd7a..0e8238d57e8fb21bddd1f4d91ed7994101c5e832 100644
--- a/install/dist/lib/gentoo.lib.php
+++ b/install/dist/lib/gentoo.lib.php
@@ -103,7 +103,7 @@ class installer extends installer_base
 
 		$reject_sender_login_mismatch = '';
 		if(isset($server_ini_array['mail']['reject_sender_login_mismatch']) && ($server_ini_array['mail']['reject_sender_login_mismatch'] == 'y')) {
-			$reject_sender_login_mismatch = ', reject_authenticated_sender_login_mismatch';
+			$reject_sender_login_mismatch = ', reject_sender_login_mismatch';
 		}
 		unset($server_ini_array);
 
diff --git a/install/dist/lib/opensuse.lib.php b/install/dist/lib/opensuse.lib.php
index da31ad6b571d204836e6b9c5ea878c70ab2ecbb5..21be53d975444aa9fff0c6cdebc387501d5aa072 100644
--- a/install/dist/lib/opensuse.lib.php
+++ b/install/dist/lib/opensuse.lib.php
@@ -165,7 +165,7 @@ class installer_dist extends installer_base {
 
 		$reject_sender_login_mismatch = '';
 		if(isset($server_ini_array['mail']['reject_sender_login_mismatch']) && ($server_ini_array['mail']['reject_sender_login_mismatch'] == 'y')) {
-			$reject_sender_login_mismatch = ', reject_authenticated_sender_login_mismatch';
+			$reject_sender_login_mismatch = ', reject_sender_login_mismatch';
 		}
 		unset($server_ini_array);
 
diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
index ab49b6753efa1a3bd11dfe9beec6309a3b48d531..c7c63e1dab54f5c85e51bd21b89304c4ca9b79f7 100644
--- a/install/lib/installer_base.lib.php
+++ b/install/lib/installer_base.lib.php
@@ -1078,7 +1078,7 @@ class installer_base {
 
 		$reject_sender_login_mismatch = '';
 		if(isset($server_ini_array['mail']['reject_sender_login_mismatch']) && ($server_ini_array['mail']['reject_sender_login_mismatch'] == 'y')) {
-			$reject_sender_login_mismatch = ', reject_authenticated_sender_login_mismatch';
+			$reject_sender_login_mismatch = ', reject_sender_login_mismatch';
 		}
 		unset($server_ini_array);
 
diff --git a/server/plugins-available/postfix_server_plugin.inc.php b/server/plugins-available/postfix_server_plugin.inc.php
index 46369d2ed1c37c937c7041cea3cc8bd4e79d1094..4795226d35675f71790376722cd10dbe1946fe33 100644
--- a/server/plugins-available/postfix_server_plugin.inc.php
+++ b/server/plugins-available/postfix_server_plugin.inc.php
@@ -146,7 +146,7 @@ class postfix_server_plugin {
 			$options = preg_split("/,\s*/", exec("postconf -h smtpd_sender_restrictions"));
 			$new_options = array();
 			foreach ($options as $key => $value) {
-				if (!preg_match('/reject_authenticated_sender_login_mismatch/', $value)) {
+				if (!preg_match('/reject_(authenticated_)?sender_login_mismatch/', $value)) {
 					$new_options[] = $value;
 				}
 			}
@@ -155,7 +155,7 @@ class postfix_server_plugin {
 				reset($new_options); $i = 0;
 				// insert after check_sender_access but before permit_...
 				while (isset($new_options[$i]) && substr($new_options[$i], 0, 19) == 'check_sender_access') ++$i;
-				array_splice($new_options, $i, 0, array('reject_authenticated_sender_login_mismatch'));
+				array_splice($new_options, $i, 0, array('reject_sender_login_mismatch'));
 			}
 			$app->system->exec_safe("postconf -e ?", 'smtpd_sender_restrictions = '.implode(", ", $new_options));
 			exec('postfix reload');