diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi
index 6def979e4..b3c7b4847 100755
--- a/html/cgi-bin/ovpnmain.cgi
+++ b/html/cgi-bin/ovpnmain.cgi
@@ -3980,6 +3980,7 @@ if ($cgiparams{'TYPE'} eq 'net') {
 			if ( -e "${General::swroot}/ovpn/ccd/$confighash{$key}[2]"){
 				unlink "${General::swroot}/ovpn/ccd/$cgiparams{'CERT_NAME'}";
 			}
+			$confighash{$key}[2] =~ s/ /_/gi;
 			open ( CCDRWCONF,'>',"${General::swroot}/ovpn/ccd/$confighash{$key}[2]") or die "Unable to create clientconfigfile $!";
 			print CCDRWCONF "# OpenVPN clientconfig from ccd extension by Copymaster#\n\n";
 			if($cgiparams{'CHECK1'} eq 'dynamic'){
diff --git a/src/scripts/ovpn-ccd-convert b/src/scripts/ovpn-ccd-convert
index ac76435f6..7aa8cf13e 100644
--- a/src/scripts/ovpn-ccd-convert
+++ b/src/scripts/ovpn-ccd-convert
@@ -31,6 +31,7 @@ open(FILE,"/var/ipfire/ovpn/server.conf");
 &General::readhasharray("/var/ipfire/ovpn/ovpnconfig", \%ovpnconfig);
 foreach my $key (keys %ovpnconfig){
 	if($ovpnconfig{$key}[32] eq '' && $ovpnconfig{$key}[3] eq 'host'){
+		$ovpnconfig{$key}[2] =~ s/ /_/gi;
 		open ( CCDRWCONF,'>',"/var/ipfire/ovpn/ccd/$ovpnconfig{$key}[2]") or die "Unable to create clientconfigfile $!";
 		print CCDRWCONF "# OpenVPN Clientconfig from CCD extension by Copymaster#\n\n";
 		print CCDRWCONF "#This client uses the dynamic pool\n\n";