diff --git a/install/autoupdate.php b/install/autoupdate.php
index f9d0e62b2fc3dfaeeebf396560cadcb8246a619a..8960e135874a77f5d538cb249a6aa17df01e49f5 100644
--- a/install/autoupdate.php
+++ b/install/autoupdate.php
@@ -198,8 +198,10 @@ if($conf['services']['mail'] == true) {
 	$inst->configure_postfix('dont-create-certs');
 
 	//** Configure mailman
-	swriteln('Configuring Mailman');
-	$inst->configure_mailman('update');
+	if($conf['mailman']['installed'] == true) {
+		swriteln('Configuring Mailman');
+		$inst->configure_mailman('update');
+	}
 
 	//* Configure Jailkit
 	swriteln('Configuring Jailkit');
diff --git a/install/dist/lib/fedora.lib.php b/install/dist/lib/fedora.lib.php
index 753db264603538ff268f5d5dcc6fae75a5362bf1..941d1ddd555a42906b2fc732c65418fdfec49ddc 100644
--- a/install/dist/lib/fedora.lib.php
+++ b/install/dist/lib/fedora.lib.php
@@ -392,7 +392,6 @@ class installer_dist extends installer_base {
 			'virtual_transport = dovecot',
 			'smtpd_sasl_type = dovecot',
 			'smtpd_sasl_path = private/auth',
-			'receive_override_options = no_address_mappings'
 		);
 
 		// Make a backup copy of the main.cf file
diff --git a/install/dist/lib/opensuse.lib.php b/install/dist/lib/opensuse.lib.php
index 35f60db9cc604ec9616f0c49084f3aff600b9d4b..192514ff766e6295f46f5779e75c5818e359fd69 100644
--- a/install/dist/lib/opensuse.lib.php
+++ b/install/dist/lib/opensuse.lib.php
@@ -443,7 +443,6 @@ class installer_dist extends installer_base {
 			'virtual_transport = dovecot',
 			'smtpd_sasl_type = dovecot',
 			'smtpd_sasl_path = private/auth',
-			'receive_override_options = no_address_mappings'
 		);
 
 		// Make a backup copy of the main.cf file
@@ -501,7 +500,7 @@ class installer_dist extends installer_base {
 		exec("chown root:root $config_dir/$configfile");
 		
 		// Dovecot shall ignore mounts in website directory
-		exec("doveadm mount add '/srv/www/*' ignore");
+		if(is_installed('doveadm')) exec("doveadm mount add '/srv/www/*' ignore > /dev/null 2> /dev/null");
 
 	}
 
diff --git a/install/install.php b/install/install.php
index 847c2fd72439858ae1bac8a726ccb3b2b5d25166..796b0273fd2502fbe75199886c06d80c133091a8 100644
--- a/install/install.php
+++ b/install/install.php
@@ -191,7 +191,9 @@ if($install_mode == 'standard') {
 	$inst->configure_postfix();
 
 	//* Configure Mailman
-	$inst->configure_mailman('install');
+	if($conf['mailman']['installed'] == true) {
+		$inst->configure_mailman('install');
+	}
 
 	//* Configure jailkit
 	swriteln('Configuring Jailkit');
diff --git a/install/update.php b/install/update.php
index 08ffcc83e42ebe24b7595d3eef8b2b3be6a1e9f6..6a1b9d13e2dac7c18395f1c13d7b7939112b7822 100644
--- a/install/update.php
+++ b/install/update.php
@@ -262,8 +262,10 @@ if($reconfigure_services_answer == 'yes') {
 		$inst->configure_postfix('dont-create-certs');
 
 		//** Configure mailman
-		swriteln('Configuring Mailman');
-		$inst->configure_mailman('update');
+		if($conf['mailman']['installed'] == true) {
+			swriteln('Configuring Mailman');
+			$inst->configure_mailman('update');
+		}
 
 		//* Configure Jailkit
 		swriteln('Configuring Jailkit');