diff --git a/interface/web/sites/web_vhost_domain_edit.php b/interface/web/sites/web_vhost_domain_edit.php
index fc5fe8308461b75b73542e19812ce8a605a2910c..09ff8abc724fe41e9ac03152dc982a1e6acbd9dc 100644
--- a/interface/web/sites/web_vhost_domain_edit.php
+++ b/interface/web/sites/web_vhost_domain_edit.php
@@ -1341,8 +1341,9 @@ class page_action extends tform_actions {
 		
 		// Letsencrypt can not be activated before the website has been created
 		// So we deactivate it here and add a datalog update in onAfterInsert
-		if(isset($this->dataRecord['ssl_letsencrypt']) && $this->dataRecord['ssl_letsencrypt'] == 'y') {
+		if(isset($this->dataRecord['ssl_letsencrypt']) && $this->dataRecord['ssl_letsencrypt'] == 'y' && isset($this->dataRecord['ssl']) && $this->dataRecord['ssl'] == 'y') {
 			$this->dataRecord['ssl_letsencrypt'] = 'n';
+			$this->dataRecord['ssl'] = 'n';
 			$this->_letsencrypt_on_insert = true;
 		}
 	}
@@ -1422,6 +1423,7 @@ class page_action extends tform_actions {
 		if($this->_letsencrypt_on_insert == true) {
 			$tmp = $web_rec;
 			$tmp['ssl_letsencrypt'] = 'y';
+			$tmp['ssl'] = 'y';
 			$app->db->datalogUpdate('web_domain', $tmp, 'domain_id', $this->id);
 			unset($tmp);
 		}
diff --git a/server/plugins-available/nginx_plugin.inc.php b/server/plugins-available/nginx_plugin.inc.php
index ece3cb03b524c551836edc2aac7efea14eee2670..82d10e67ab3e485c2eff7402a3044bc2c8333f25 100644
--- a/server/plugins-available/nginx_plugin.inc.php
+++ b/server/plugins-available/nginx_plugin.inc.php
@@ -932,6 +932,7 @@ class nginx_plugin {
 		$tpl->newTemplate('nginx_vhost.conf.master');
 
 		// IPv4
+		if($data['new']['ip_address'] == '') $data['new']['ip_address'] = '*';
 
 		//* use ip-mapping for web-mirror
 		if($data['new']['ip_address'] != '*' && $conf['mirror_server_id'] > 0) {