diff --git a/lib/site-ssl b/lib/site-ssl
index e29d789..8b73e5f 100644
--- a/lib/site-ssl
+++ b/lib/site-ssl
@@ -58,7 +58,9 @@ site_ssl_on() {
 	
 	# Create new certificate
 	[[ $(conf_read debug) == "true" ]] && param="--test-cert" || param=""
-	if [[ ! -a /etc/letsencrypt/live/$domain/fullchain.pem && $subdomflag == 0 ]]; then
+	if [[ ! -a /etc/letsencrypt/live/$domain/fullchain.pem && $cache == "-wildcard" ]]; then
+		sudo certbot certonly --manual --preferred-challenges=dns --no-eff-email --manual-public-ip-logging-ok --agree-tos --staple-ocsp --must-staple --email $cermail -d $domain -d *.$domain $param
+	elif [[ ! -a /etc/letsencrypt/live/$domain/fullchain.pem && $subdomflag == 0 ]]; then
 		sudo certbot certonly --webroot -w /var/www/$root/htdocs/ -d $domain -d www.$domain --email $cermail --no-eff-email --agree-tos --staple-ocsp --must-staple $param
 	elif [[ ! -a /etc/letsencrypt/live/$domain/fullchain.pem && $subdomflag == 1 ]]; then
 		sudo certbot certonly --webroot -w /var/www/$root/htdocs/ -d $domain --email $cermail --no-eff-email --agree-tos --staple-ocsp --must-staple $param
diff --git a/plugins/site b/plugins/site
index 94c5328..a0c82d2 100644
--- a/plugins/site
+++ b/plugins/site
@@ -3,7 +3,7 @@
 # Site Manager Plugin (Create, delete and de/activate)
 # Syntax: site <domain> <option> <argument>
 # Options: -html, -php, -mysql, -wp, -wpsubdir, -wpsubdom, -parked, -proxy, -on, -off, -delete, -delete-all, -list, -nocache, -cache, -ssl-on, ssl-off, -force-redirect
-# Arguments: -cache, -root, -subdomain, -ignore-ssl
+# Arguments: -cache, -root, -subdomain, -ignore-ssl, -wildcard
 
 # shopt is necessary for this kind !(html|22222) of patterns
 shopt -s extglob
@@ -24,7 +24,7 @@ if [[ ! $(conf_read nginx) == "true" ]]; then
 fi
 
 # Check if user entered arg before option and correct it.
-if [[ -n $cache && ($type == "-cache" || $type == "-ignore-ssl") ]]; then
+if [[ -n $cache && ($type == "-cache" || $type == "-root" || $type == "-subdomain" || $type == "-ignore-ssl" || $type == "-wildcard") ]]; then
 	type="$3"
 	cache="$2"
 fi
@@ -111,7 +111,7 @@ fi
 if [[ $cache == "-cache" && $wp == [045] ]]; then
 	echo "${red} Site $domain is not a WP site! ${end}"
 	exit 1
-elif [[ -n $cache && ( $cache != "-cache" && $cache != "-root" && $cache != "-subdomain" && $cache != "-ignore-ssl" ) && $type != "-parked" ]]; then
+elif [[ -n $cache && ( $cache != "-cache" && $cache != "-root" && $cache != "-subdomain" && $cache != "-ignore-ssl" && $cache != "-wildcard" ) && $type != "-parked" ]]; then
 	echo "${red} $cache is not a valid argument! ${end}"
 	exit 1
 fi