diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
index f193c7d5345e8257439b12ef3c086dbe49e3ea50..19ce6cadf846dd1d9e16473b758e470bbeb35105 100644
--- a/install/lib/installer_base.lib.php
+++ b/install/lib/installer_base.lib.php
@@ -2340,6 +2340,12 @@ class installer_base {
 		//* chown the interface files to the ispconfig user and group
 		$command = 'chown -R ispconfig:ispconfig '.$install_dir.'/interface';
 		caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
+
+		//* Chmod the files and directories in the acme dir with nginx installed
+		if($conf['nginx']['installed'] == true) {
+			$command = 'chmod -R 755 '.$install_dir.'/interface/acme';
+			caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
+		}
 		
 		//* chown the server files to the root user and group
 		$command = 'chown -R root:root '.$install_dir.'/server';
diff --git a/interface/web/admin/form/server_php.tform.php b/interface/web/admin/form/server_php.tform.php
index 1174b8c098c27c8e0387641dce2134ef36db097b..d5b0c5ff73781ac56b3da21dc0d8f598c0eac892 100644
--- a/interface/web/admin/form/server_php.tform.php
+++ b/interface/web/admin/form/server_php.tform.php
@@ -89,7 +89,7 @@ $form["tabs"]['php_name'] = array (
 			'formtype' => 'SELECT',
 			'default' => '',
 			'datasource' => array (  'type' => 'SQL',
-				'querystring' => 'SELECT server_id,server_name FROM server WHERE mirror_server_id = 0 AND {AUTHSQL} ORDER BY server_name',
+				'querystring' => 'SELECT server_id,server_name FROM server WHERE mirror_server_id = 0 AND web_server = 1 AND {AUTHSQL} ORDER BY server_name',
 				'keyfield'=> 'server_id',
 				'valuefield'=> 'server_name'
 			),
diff --git a/interface/web/dns/dns_wizard.php b/interface/web/dns/dns_wizard.php
index 68b30a80748cfdbe4603c03f28451dfe3eda99f2..e163e4eeab5d33e68799c5d4720d94f52b747005 100644
--- a/interface/web/dns/dns_wizard.php
+++ b/interface/web/dns/dns_wizard.php
@@ -421,6 +421,7 @@ if($_POST['create'] == 1) {
 			"dnssec_wanted" => $enable_dnssec
 		);
 		$dns_soa_id = $app->db->datalogInsert('dns_soa', $insert_data, 'id');
+		if($dns_soa_id > 0) $app->plugin->raiseEvent('dns:wizard:on_after_insert', $dns_soa_id);
 
 		// Insert the dns_rr records
 		if(is_array($dns_rr) && $dns_soa_id > 0) {
diff --git a/interface/web/dns/form/dns_slave.tform.php b/interface/web/dns/form/dns_slave.tform.php
index a5570040deb67e7bc35133b9236147f93138381e..2f287dbfd7a291a7788a00be23c62514290d0818 100644
--- a/interface/web/dns/form/dns_slave.tform.php
+++ b/interface/web/dns/form/dns_slave.tform.php
@@ -108,10 +108,16 @@ $form["tabs"]['dns_slave'] = array (
 		'ns' => array (
 			'datatype' => 'VARCHAR',
 			'formtype' => 'TEXT',
+/*
 			'validators' => array (  0 => array ( 'type' => 'REGEX',
 					'regex' => '/^[0-9\.]{1,255}$/',
 					'errmsg'=> 'ns_error_regex'),
 			),
+*/
+			'validators' => array (  0 => array ( 'type' => 'ISIP',
+					'separator' => ',',
+					'errmsg'=> 'ns_error_regex'),
+			),
 			'default' => '',
 			'value'  => '',
 			'width'  => '30',
diff --git a/interface/web/dns/lib/lang/ar_dns_slave.lng b/interface/web/dns/lib/lang/ar_dns_slave.lng
index c426df7ed5e78a2746d02ac55df9f075eda3dfad..416e3d6e722ccae2c29e3da6707d1d36eb4155b0 100644
--- a/interface/web/dns/lib/lang/ar_dns_slave.lng
+++ b/interface/web/dns/lib/lang/ar_dns_slave.lng
@@ -12,6 +12,6 @@ $wb['origin_error_unique'] = 'There is already a record for this zone.';
 $wb['origin_error_regex'] = 'Zone has a invalid format.';
 $wb['ns_error_regex'] = 'NS has a invalid format.';
 $wb['eg_domain_tld'] = 'e.g. domain.tld.';
-$wb['ipv4_form_txt'] = 'IPv4 form - e.g. 1.2.3.4';
+$wb['ipv4_form_txt'] = 'Separate multiple IPs with commas';
 $wb['secondary_zone_txt'] = 'Secondary DNS Zone';
 ?>
diff --git a/interface/web/dns/lib/lang/bg_dns_slave.lng b/interface/web/dns/lib/lang/bg_dns_slave.lng
index d96533a3ee80b994ecb1bde32a545519f98a20de..d2bface7d176117fd5aeac570568396f09b4fcaa 100644
--- a/interface/web/dns/lib/lang/bg_dns_slave.lng
+++ b/interface/web/dns/lib/lang/bg_dns_slave.lng
@@ -12,6 +12,6 @@ $wb['origin_error_unique'] = 'Вече има запис за тази зона.
 $wb['origin_error_regex'] = 'Името на зоната е в грешен формат.';
 $wb['ns_error_regex'] = 'NS е в грешен формат.';
 $wb['eg_domain_tld'] = 'примерно domain.tld.';
-$wb['ipv4_form_txt'] = 'IPv4 формата изглейда така: 1.2.3.4';
+$wb['ipv4_form_txt'] = 'Separate multiple IPs with commas';
 $wb['secondary_zone_txt'] = 'Secondary DNS Zone';
 ?>
diff --git a/interface/web/dns/lib/lang/br_dns_slave.lng b/interface/web/dns/lib/lang/br_dns_slave.lng
index bb0f925d62c870cdbcfeb5a99e56963bf664c2a8..5fe91a3e5b2392e3c2d9f4870ddbcbfbe442daf8 100644
--- a/interface/web/dns/lib/lang/br_dns_slave.lng
+++ b/interface/web/dns/lib/lang/br_dns_slave.lng
@@ -12,6 +12,6 @@ $wb['origin_error_unique'] = 'Já existe um registro igual para esta zona.';
 $wb['origin_error_regex'] = 'Zona inválida.';
 $wb['ns_error_regex'] = 'Registro NS inválido.';
 $wb['eg_domain_tld'] = 'ex.: dominio.com.';
-$wb['ipv4_form_txt'] = 'Formato IPv4 - ex.: 1.2.3.4';
+$wb['ipv4_form_txt'] = 'Separate multiple IPs with commas';
 $wb['secondary_zone_txt'] = 'Zona dns secundária';
 ?>
diff --git a/interface/web/dns/lib/lang/ca_dns_slave.lng b/interface/web/dns/lib/lang/ca_dns_slave.lng
index 887cc7dcd4957752dc91eff71e70ef42c75c1e86..016c8fb11db96e0036384183f8a4532fe67aaeeb 100644
--- a/interface/web/dns/lib/lang/ca_dns_slave.lng
+++ b/interface/web/dns/lib/lang/ca_dns_slave.lng
@@ -12,6 +12,6 @@ $wb['origin_error_unique'] = 'Il y a déjà un enregistrement pour cette zone.';
 $wb['origin_error_regex'] = 'Le format de la zone est invalide.';
 $wb['ns_error_regex'] = 'Le format de l\'enregistrement NS est invalide.';
 $wb['eg_domain_tld'] = 'ex. domain.tld.';
-$wb['ipv4_form_txt'] = 'Format IPv4 - ex. 1.2.3.4';
+$wb['ipv4_form_txt'] = 'Separate multiple IPs with commas';
 $wb['secondary_zone_txt'] = 'Zone DNS secondaire';
 ?>
diff --git a/interface/web/dns/lib/lang/cz_dns_slave.lng b/interface/web/dns/lib/lang/cz_dns_slave.lng
index 349a01bdbbabbf9e93153727d3c36443c0a02de3..c411ce870fa4f024c19ec18a7ac687e0c773f882 100644
--- a/interface/web/dns/lib/lang/cz_dns_slave.lng
+++ b/interface/web/dns/lib/lang/cz_dns_slave.lng
@@ -12,6 +12,6 @@ $wb['origin_error_unique'] = 'Pro tuto zónu již existuje záznam.';
 $wb['origin_error_regex'] = 'Zóna má neplatný formát.';
 $wb['ns_error_regex'] = 'NS má neplatný formát.';
 $wb['eg_domain_tld'] = 'napÅ™. domena.cz';
-$wb['ipv4_form_txt'] = 'IPV4 formát, např. 1.2.3.4';
+$wb['ipv4_form_txt'] = 'Separate multiple IPs with commas';
 $wb['secondary_zone_txt'] = 'Sekundární DNS zóna';
 ?>
diff --git a/interface/web/dns/lib/lang/de_dns_slave.lng b/interface/web/dns/lib/lang/de_dns_slave.lng
index 1b58088317e764ae3b6d92a651bbf14b4819db7b..6ba2cf9c2ae4dd45bc8f167a30b1f88df2fd7d77 100644
--- a/interface/web/dns/lib/lang/de_dns_slave.lng
+++ b/interface/web/dns/lib/lang/de_dns_slave.lng
@@ -13,5 +13,5 @@ $wb['origin_error_unique'] = 'Es existiert bereits ein Eintrag für diese Zone.'
 $wb['origin_error_regex'] = 'Zone hat ein ungültiges Format.';
 $wb['ns_error_regex'] = 'NS hat ein ungültiges Format.';
 $wb['eg_domain_tld'] = 'Format: domain.tld.';
-$wb['ipv4_form_txt'] = 'IPv4 Format: 1.2.3.4';
+$wb['ipv4_form_txt'] = 'Separate multiple IPs with commas';
 ?>
diff --git a/interface/web/dns/lib/lang/dk_dns_slave.lng b/interface/web/dns/lib/lang/dk_dns_slave.lng
index 1414a94e9eb91b6565e32ab2a7d09b213a581722..d5c87de9fe09a519df9ab2d21b0eba4e7af1e0c0 100644
--- a/interface/web/dns/lib/lang/dk_dns_slave.lng
+++ b/interface/web/dns/lib/lang/dk_dns_slave.lng
@@ -13,5 +13,5 @@ $wb['origin_error_unique'] = 'Der findes allerede en post for denne zone.';
 $wb['origin_error_regex'] = 'Zone har et ugyldigt format.';
 $wb['ns_error_regex'] = 'NS har et ugyldigt format.';
 $wb['eg_domain_tld'] = 'f.eks. domæne.tld.';
-$wb['ipv4_form_txt'] = 'IPv4 form - f.eks. 1.2.3.4';
+$wb['ipv4_form_txt'] = 'Separate multiple IPs with commas';
 ?>
diff --git a/interface/web/dns/lib/lang/el_dns_slave.lng b/interface/web/dns/lib/lang/el_dns_slave.lng
index 64db9755e8e072f6b609c1fc03d4f185ea0d37bd..b1f9d7fa0cd1c2787d9de8e2a83de3b22153a465 100644
--- a/interface/web/dns/lib/lang/el_dns_slave.lng
+++ b/interface/web/dns/lib/lang/el_dns_slave.lng
@@ -12,6 +12,6 @@ $wb['origin_error_unique'] = 'Υπάρχει ήδη μια εγγραφή για
 $wb['origin_error_regex'] = 'Η ζώνη δεν έχει έγκυρη μορφοποίηση.';
 $wb['ns_error_regex'] = 'Ο NS δεν έχει έγκυρη μορφοποίηση.';
 $wb['eg_domain_tld'] = 'π.χ. domain.tld.';
-$wb['ipv4_form_txt'] = 'μορφή IPv4 - π.χ. 1.2.3.4';
+$wb['ipv4_form_txt'] = 'Separate multiple IPs with commas';
 $wb['secondary_zone_txt'] = 'Secondary DNS Zone';
 ?>
diff --git a/interface/web/dns/lib/lang/en_dns_slave.lng b/interface/web/dns/lib/lang/en_dns_slave.lng
index fc27ee9379487b8cbb9922e4b975e07a5b08c902..055bc69688014aa0d2e0ae5cb46fce616ee9966c 100644
--- a/interface/web/dns/lib/lang/en_dns_slave.lng
+++ b/interface/web/dns/lib/lang/en_dns_slave.lng
@@ -13,5 +13,5 @@ $wb["origin_error_unique"] = 'There is already a record for this zone.';
 $wb["origin_error_regex"] = 'Zone has a invalid format.';
 $wb["ns_error_regex"] = 'NS has a invalid format.';
 $wb['eg_domain_tld'] = 'e.g. domain.tld.';
-$wb['ipv4_form_txt'] = 'IPv4 form - e.g. 1.2.3.4';
+$wb['ipv4_form_txt'] = 'Separate multiple IPs with commas';
 ?>
diff --git a/interface/web/dns/lib/lang/es_dns_slave.lng b/interface/web/dns/lib/lang/es_dns_slave.lng
old mode 100755
new mode 100644
index 68690b1a027375e5594e8ee609c5ea564cc0f3de..bd13c32af82c29f468f2afab5714afa62113435b
--- a/interface/web/dns/lib/lang/es_dns_slave.lng
+++ b/interface/web/dns/lib/lang/es_dns_slave.lng
@@ -2,7 +2,7 @@
 $wb['active_txt'] = 'Habilitado';
 $wb['client_txt'] = 'Cliente';
 $wb['eg_domain_tld'] = 'eje. dominio.tld.';
-$wb['ipv4_form_txt'] = 'Formato IPv4 - eje. 1.2.3.4';
+$wb['ipv4_form_txt'] = 'Separate multiple IPs with commas';
 $wb['ns_error_regex'] = 'El registro NS contiene un formato inválido.';
 $wb['ns_txt'] = 'NS (Dirección IP)';
 $wb['origin_error_empty'] = 'Zona vacía.';
diff --git a/interface/web/dns/lib/lang/fi_dns_slave.lng b/interface/web/dns/lib/lang/fi_dns_slave.lng
index c426df7ed5e78a2746d02ac55df9f075eda3dfad..416e3d6e722ccae2c29e3da6707d1d36eb4155b0 100644
--- a/interface/web/dns/lib/lang/fi_dns_slave.lng
+++ b/interface/web/dns/lib/lang/fi_dns_slave.lng
@@ -12,6 +12,6 @@ $wb['origin_error_unique'] = 'There is already a record for this zone.';
 $wb['origin_error_regex'] = 'Zone has a invalid format.';
 $wb['ns_error_regex'] = 'NS has a invalid format.';
 $wb['eg_domain_tld'] = 'e.g. domain.tld.';
-$wb['ipv4_form_txt'] = 'IPv4 form - e.g. 1.2.3.4';
+$wb['ipv4_form_txt'] = 'Separate multiple IPs with commas';
 $wb['secondary_zone_txt'] = 'Secondary DNS Zone';
 ?>
diff --git a/interface/web/dns/lib/lang/fr_dns_slave.lng b/interface/web/dns/lib/lang/fr_dns_slave.lng
index c3795322b7b4cd551e74c5e068ca2d15f43c755b..45f571e448504a9236b8e800a382f6a6c007a3a1 100644
--- a/interface/web/dns/lib/lang/fr_dns_slave.lng
+++ b/interface/web/dns/lib/lang/fr_dns_slave.lng
@@ -12,6 +12,6 @@ $wb['origin_error_unique'] = 'Il y a déjà un enregistrement pour cette zone.';
 $wb['origin_error_regex'] = 'Le format de la zone est invalide.';
 $wb['ns_error_regex'] = 'Le format de l’enregistrement NS est invalide.';
 $wb['eg_domain_tld'] = 'ex. domain.tld.';
-$wb['ipv4_form_txt'] = 'Format IPv4 - ex. 1.2.3.4';
+$wb['ipv4_form_txt'] = 'Separate multiple IPs with commas';
 $wb['secondary_zone_txt'] = 'Zone DNS secondaire';
 ?>
diff --git a/interface/web/dns/lib/lang/hr_dns_slave.lng b/interface/web/dns/lib/lang/hr_dns_slave.lng
index 5bfb6b8d7867400ff51f0e34d7fd336fad413a13..c6ee822d0ab9887b2a723f96ffce54a3f2bf7bd7 100644
--- a/interface/web/dns/lib/lang/hr_dns_slave.lng
+++ b/interface/web/dns/lib/lang/hr_dns_slave.lng
@@ -12,6 +12,6 @@ $wb['origin_error_unique'] = 'Već postoji zapis za ovu zonu.';
 $wb['origin_error_regex'] = 'Zona je u pogrešnom formatu.';
 $wb['ns_error_regex'] = 'NS je u pogrešnom formatu.';
 $wb['eg_domain_tld'] = 'npr. domena.tld.';
-$wb['ipv4_form_txt'] = 'IPv4 forma - npr. 1.2.3.4';
+$wb['ipv4_form_txt'] = 'Separate multiple IPs with commas';
 $wb['secondary_zone_txt'] = 'Sekundarne DNS zone';
 ?>
diff --git a/interface/web/dns/lib/lang/hu_dns_slave.lng b/interface/web/dns/lib/lang/hu_dns_slave.lng
index bec75dfc0c38371db66b9aea9ba2f17368b9f8d6..7bc27e3a51092a82de02096c4dd3d82551ad2763 100644
--- a/interface/web/dns/lib/lang/hu_dns_slave.lng
+++ b/interface/web/dns/lib/lang/hu_dns_slave.lng
@@ -12,6 +12,6 @@ $wb['origin_error_unique'] = 'There is already a record for this zone.';
 $wb['origin_error_regex'] = 'Zone has a invalid format.';
 $wb['ns_error_regex'] = 'NS has a invalid format.';
 $wb['eg_domain_tld'] = 'e.g. domain.tld.';
-$wb['ipv4_form_txt'] = 'IPv4 form - e.g. 1.2.3.4';
+$wb['ipv4_form_txt'] = 'Separate multiple IPs with commas';
 $wb['secondary_zone_txt'] = 'Secondary DNS Zone';
 ?>
diff --git a/interface/web/dns/lib/lang/id_dns_slave.lng b/interface/web/dns/lib/lang/id_dns_slave.lng
index 099a8b2b659993c5a36f5386a82e9c3c8a3cfd67..e87310bacc5fedabe61d7c87b0aea967547c53c7 100644
--- a/interface/web/dns/lib/lang/id_dns_slave.lng
+++ b/interface/web/dns/lib/lang/id_dns_slave.lng
@@ -12,6 +12,6 @@ $wb['origin_error_unique'] = 'Sudah ada record untuk zona ini.';
 $wb['origin_error_regex'] = 'Zona memiliki format yang tidak valid.';
 $wb['ns_error_regex'] = 'NS memiliki format yang tidak valid.';
 $wb['eg_domain_tld'] = 'e.g. domain.tld.';
-$wb['ipv4_form_txt'] = 'IPv4 form - e.g. 1.2.3.4';
+$wb['ipv4_form_txt'] = 'Separate multiple IPs with commas';
 $wb['secondary_zone_txt'] = 'Secondary DNS Zone';
 ?>
diff --git a/interface/web/dns/lib/lang/it_dns_slave.lng b/interface/web/dns/lib/lang/it_dns_slave.lng
index cbd6a3a418bce181a1ca6008a69db9e9105a8512..beae2824e47a1e280ae4a1dbe23cfb20607d547f 100644
--- a/interface/web/dns/lib/lang/it_dns_slave.lng
+++ b/interface/web/dns/lib/lang/it_dns_slave.lng
@@ -12,6 +12,6 @@ $wb['origin_error_unique'] = 'There is already a record for this zone.';
 $wb['origin_error_regex'] = 'Zone has a invalid format.';
 $wb['ns_error_regex'] = 'NS has a invalid format.';
 $wb['eg_domain_tld'] = 'e.g. domain.tld.';
-$wb['ipv4_form_txt'] = 'IPv4 form - e.g. 1.2.3.4';
+$wb['ipv4_form_txt'] = 'Separate multiple IPs with commas';
 $wb['secondary_zone_txt'] = 'Secondary DNS Zone';
 ?>
diff --git a/interface/web/dns/lib/lang/ja_dns_slave.lng b/interface/web/dns/lib/lang/ja_dns_slave.lng
index c426df7ed5e78a2746d02ac55df9f075eda3dfad..416e3d6e722ccae2c29e3da6707d1d36eb4155b0 100644
--- a/interface/web/dns/lib/lang/ja_dns_slave.lng
+++ b/interface/web/dns/lib/lang/ja_dns_slave.lng
@@ -12,6 +12,6 @@ $wb['origin_error_unique'] = 'There is already a record for this zone.';
 $wb['origin_error_regex'] = 'Zone has a invalid format.';
 $wb['ns_error_regex'] = 'NS has a invalid format.';
 $wb['eg_domain_tld'] = 'e.g. domain.tld.';
-$wb['ipv4_form_txt'] = 'IPv4 form - e.g. 1.2.3.4';
+$wb['ipv4_form_txt'] = 'Separate multiple IPs with commas';
 $wb['secondary_zone_txt'] = 'Secondary DNS Zone';
 ?>
diff --git a/interface/web/dns/lib/lang/nl_dns_slave.lng b/interface/web/dns/lib/lang/nl_dns_slave.lng
index 98d27c8d3098ad7c3c65c21e481cb0d534d75229..2cf4d13922dd5bb9ac1d36942c318e478b79fb53 100644
--- a/interface/web/dns/lib/lang/nl_dns_slave.lng
+++ b/interface/web/dns/lib/lang/nl_dns_slave.lng
@@ -12,6 +12,6 @@ $wb['origin_error_unique'] = 'Er is al een record for deze zone.';
 $wb['origin_error_regex'] = 'Zone heeft een ongeldig formaat.';
 $wb['ns_error_regex'] = 'NS heeft een ongeldig formaat.';
 $wb['eg_domain_tld'] = 'e.g. domain.tld.';
-$wb['ipv4_form_txt'] = 'IPv4 form - e.g. 1.2.3.4';
+$wb['ipv4_form_txt'] = 'Separate multiple IPs with commas';
 $wb['secondary_zone_txt'] = 'Secondary DNS Zone';
 ?>
diff --git a/interface/web/dns/lib/lang/pl_dns_slave.lng b/interface/web/dns/lib/lang/pl_dns_slave.lng
index 42dea7cd196215a6f0eb20df6d234e1e4086768c..ceee10f124209c33d9a64d60346bcff8e3547826 100644
--- a/interface/web/dns/lib/lang/pl_dns_slave.lng
+++ b/interface/web/dns/lib/lang/pl_dns_slave.lng
@@ -12,6 +12,6 @@ $wb['origin_error_unique'] = 'Jest już rekord w tej strefie.';
 $wb['origin_error_regex'] = 'Strefa ma niepoprawny format.';
 $wb['ns_error_regex'] = 'NS ma niepoprawny format.';
 $wb['eg_domain_tld'] = 'np. domena.pl.';
-$wb['ipv4_form_txt'] = 'notacja IPv4 - np. 127.0.0.1';
+$wb['ipv4_form_txt'] = 'Separate multiple IPs with commas';
 $wb['secondary_zone_txt'] = 'Zapasowa Strefa DNS';
 ?>
diff --git a/interface/web/dns/lib/lang/pt_dns_slave.lng b/interface/web/dns/lib/lang/pt_dns_slave.lng
index c426df7ed5e78a2746d02ac55df9f075eda3dfad..416e3d6e722ccae2c29e3da6707d1d36eb4155b0 100644
--- a/interface/web/dns/lib/lang/pt_dns_slave.lng
+++ b/interface/web/dns/lib/lang/pt_dns_slave.lng
@@ -12,6 +12,6 @@ $wb['origin_error_unique'] = 'There is already a record for this zone.';
 $wb['origin_error_regex'] = 'Zone has a invalid format.';
 $wb['ns_error_regex'] = 'NS has a invalid format.';
 $wb['eg_domain_tld'] = 'e.g. domain.tld.';
-$wb['ipv4_form_txt'] = 'IPv4 form - e.g. 1.2.3.4';
+$wb['ipv4_form_txt'] = 'Separate multiple IPs with commas';
 $wb['secondary_zone_txt'] = 'Secondary DNS Zone';
 ?>
diff --git a/interface/web/dns/lib/lang/ro_dns_slave.lng b/interface/web/dns/lib/lang/ro_dns_slave.lng
index c426df7ed5e78a2746d02ac55df9f075eda3dfad..416e3d6e722ccae2c29e3da6707d1d36eb4155b0 100644
--- a/interface/web/dns/lib/lang/ro_dns_slave.lng
+++ b/interface/web/dns/lib/lang/ro_dns_slave.lng
@@ -12,6 +12,6 @@ $wb['origin_error_unique'] = 'There is already a record for this zone.';
 $wb['origin_error_regex'] = 'Zone has a invalid format.';
 $wb['ns_error_regex'] = 'NS has a invalid format.';
 $wb['eg_domain_tld'] = 'e.g. domain.tld.';
-$wb['ipv4_form_txt'] = 'IPv4 form - e.g. 1.2.3.4';
+$wb['ipv4_form_txt'] = 'Separate multiple IPs with commas';
 $wb['secondary_zone_txt'] = 'Secondary DNS Zone';
 ?>
diff --git a/interface/web/dns/lib/lang/ru_dns_slave.lng b/interface/web/dns/lib/lang/ru_dns_slave.lng
index 38b86608f921647c2dbd08c30e97ba6c81af1f30..43467ca07424763c60241850ae90b9cf95452354 100644
--- a/interface/web/dns/lib/lang/ru_dns_slave.lng
+++ b/interface/web/dns/lib/lang/ru_dns_slave.lng
@@ -12,6 +12,6 @@ $wb['origin_error_unique'] = 'Для этой зоны уже есть запи
 $wb['origin_error_regex'] = 'Зона имеет неправильный формат.';
 $wb['ns_error_regex'] = 'NS имеет неправильный формат.';
 $wb['eg_domain_tld'] = 'Например, domain.tld.';
-$wb['ipv4_form_txt'] = 'Формат IPv4 - например, 1.2.3.4';
+$wb['ipv4_form_txt'] = 'Separate multiple IPs with commas';
 $wb['secondary_zone_txt'] = 'Вторичная DNS-зона';
 ?>
diff --git a/interface/web/dns/lib/lang/se_dns_slave.lng b/interface/web/dns/lib/lang/se_dns_slave.lng
index c426df7ed5e78a2746d02ac55df9f075eda3dfad..416e3d6e722ccae2c29e3da6707d1d36eb4155b0 100644
--- a/interface/web/dns/lib/lang/se_dns_slave.lng
+++ b/interface/web/dns/lib/lang/se_dns_slave.lng
@@ -12,6 +12,6 @@ $wb['origin_error_unique'] = 'There is already a record for this zone.';
 $wb['origin_error_regex'] = 'Zone has a invalid format.';
 $wb['ns_error_regex'] = 'NS has a invalid format.';
 $wb['eg_domain_tld'] = 'e.g. domain.tld.';
-$wb['ipv4_form_txt'] = 'IPv4 form - e.g. 1.2.3.4';
+$wb['ipv4_form_txt'] = 'Separate multiple IPs with commas';
 $wb['secondary_zone_txt'] = 'Secondary DNS Zone';
 ?>
diff --git a/interface/web/dns/lib/lang/sk_dns_slave.lng b/interface/web/dns/lib/lang/sk_dns_slave.lng
index c426df7ed5e78a2746d02ac55df9f075eda3dfad..416e3d6e722ccae2c29e3da6707d1d36eb4155b0 100644
--- a/interface/web/dns/lib/lang/sk_dns_slave.lng
+++ b/interface/web/dns/lib/lang/sk_dns_slave.lng
@@ -12,6 +12,6 @@ $wb['origin_error_unique'] = 'There is already a record for this zone.';
 $wb['origin_error_regex'] = 'Zone has a invalid format.';
 $wb['ns_error_regex'] = 'NS has a invalid format.';
 $wb['eg_domain_tld'] = 'e.g. domain.tld.';
-$wb['ipv4_form_txt'] = 'IPv4 form - e.g. 1.2.3.4';
+$wb['ipv4_form_txt'] = 'Separate multiple IPs with commas';
 $wb['secondary_zone_txt'] = 'Secondary DNS Zone';
 ?>
diff --git a/interface/web/dns/lib/lang/tr_dns_slave.lng b/interface/web/dns/lib/lang/tr_dns_slave.lng
index eeee447fbcc8c755ca769442e74e1afb46ed6047..d6c83a92fa40548a7163a31570326132108e3e0c 100644
--- a/interface/web/dns/lib/lang/tr_dns_slave.lng
+++ b/interface/web/dns/lib/lang/tr_dns_slave.lng
@@ -13,5 +13,5 @@ $wb['origin_error_unique'] = 'Bu bölge için zaten bir kayıt var.';
 $wb['origin_error_regex'] = 'Bölge biçimi geçersiz.';
 $wb['ns_error_regex'] = 'NS biçimi geçersiz.';
 $wb['eg_domain_tld'] = 'Örnek: domain.tld.';
-$wb['ipv4_form_txt'] = 'IPv4 biçimi - Örnek: 1.2.3.4';
+$wb['ipv4_form_txt'] = 'Separate multiple IPs with commas';
 ?>
diff --git a/server/conf/nginx_vhost.conf.master b/server/conf/nginx_vhost.conf.master
index 0240a8c4ecc46d6084f0e7d7dc50eaefdf7f9e35..b84f0bd872d66407961ade54a5567ef869c67dc8 100644
--- a/server/conf/nginx_vhost.conf.master
+++ b/server/conf/nginx_vhost.conf.master
@@ -273,13 +273,6 @@ server {
         }
 </tmpl_if>
 
-location ~ /\.well-known/acme-challenge/ {
-	   root /usr/local/ispconfig/interface/acme/;
-	   index index.html index.htm;
-	   try_files $uri =404;
-}
-
-
 <tmpl_loop name="basic_auth_locations">
         location <tmpl_var name='htpasswd_location'> { ##merge##
                 auth_basic "Members Only";
diff --git a/server/plugins-available/bind_plugin.inc.php b/server/plugins-available/bind_plugin.inc.php
index 80d302bee0b3db0bfc0ca492eb6a77bb5dfde281..23856f0c8661f3317f4beaa91f2fb20c92ac93c2 100644
--- a/server/plugins-available/bind_plugin.inc.php
+++ b/server/plugins-available/bind_plugin.inc.php
@@ -544,7 +544,9 @@ class bind_plugin {
 
 		foreach($tmps_sec as $tmp) {
 
-			$options = "        masters {".$tmp['ns'].";};\n";
+			// When you have more than one master, the serial number is used to determine which Master has the most current version of the zone by the
+			// slaves.  The slaves actually ask for the SOA record from each Master when refreshing. 
+			$options = "        masters {".str_replace(',', ';', $tmp['ns']).";};\n";
 			if(trim($tmp['xfer']) != '') {
 				$options .= "        allow-transfer {".str_replace(',', ';', $tmp['xfer']).";};\n";
 			} else {