diff --git a/config/cfgroot/general-functions.pl b/config/cfgroot/general-functions.pl
index 98bedb4b9..d871025eb 100644
--- a/config/cfgroot/general-functions.pl
+++ b/config/cfgroot/general-functions.pl
@@ -760,7 +760,7 @@ sub validwildcarddomainname($) {
 	my $domainname = shift;
 
 	# Ignore any leading dots
-	if ($domainname =~ m/^\*\.(.*)/) {
+	if ($domainname =~ m/^\*\.([^\*]*)\*?/) {
 		$domainname = $1;
 	}