diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
index 5eb45c36b03488c6c5538ca8a4468d49637adf28..5771c078ede91d6278467cccf602523177be6810 100644
--- a/install/lib/installer_base.lib.php
+++ b/install/lib/installer_base.lib.php
@@ -1348,6 +1348,7 @@ class installer_base {
 		$add_amavis = !$this->get_postfix_service('amavis','unix');
 		$add_amavis_10025 = !$this->get_postfix_service('127.0.0.1:10025','inet');
 		$add_amavis_10027 = !$this->get_postfix_service('127.0.0.1:10027','inet');
+		//*TODO: check templates against existing postfix-services to make sure we use the template
 
 		if ($add_amavis || $add_amavis_10025 || $add_amavis_10027) {
 			//* backup master.cf
diff --git a/install/tpl/master_cf_amavis.master b/install/tpl/master_cf_amavis.master
index 54478f3c8046593b09fe569d24894ab7d94e8994..243f28a288dc2e5f27a54f79422a9b5f48571d76 100644
--- a/install/tpl/master_cf_amavis.master
+++ b/install/tpl/master_cf_amavis.master
@@ -2,4 +2,5 @@
 amavis unix - - - - 2 smtp
         -o smtp_data_done_timeout=1200
         -o smtp_send_xforward_command=yes
+		-o smtp_bind_address=