diff --git a/config/ovpn/verify b/config/ovpn/verify
index 72334296c..44ed1105d 100644
--- a/config/ovpn/verify
+++ b/config/ovpn/verify
@@ -49,7 +49,7 @@ if (-f "${General::swroot}/ovpn/ovpnconfig"){
 		exit 0 if ($cn eq $CN);
 
 		# Compatibility code for incorrectly saved CNs.
-		$cn =~ s/\ /_/;
+		$cn =~ s/\ /_/g;
 		exit 0 if ($cn eq $CN);
 	}
 }
diff --git a/config/rootfiles/core/72/filelists/files b/config/rootfiles/core/72/filelists/files
index f25463113..baa5d6cc4 100644
--- a/config/rootfiles/core/72/filelists/files
+++ b/config/rootfiles/core/72/filelists/files
@@ -5,3 +5,4 @@ srv/web/ipfire/cgi-bin/ddns.cgi
 srv/web/ipfire/cgi-bin/vpnmain.cgi
 usr/local/bin/openvpnctrl
 usr/local/bin/setddns.pl
+var/ipfire/ovpn/verify