diff --git a/config/ovpn/verify b/config/ovpn/verify
index 44ed1105d..1a1fcb501 100644
--- a/config/ovpn/verify
+++ b/config/ovpn/verify
@@ -30,8 +30,8 @@ my $CN    = $ARGV[1];
 exit 0 unless ($DEPTH eq "0");
 
 # Strip the CN from the X509 identifier.
-$CN =~ /\/CN=(.*)$/i;
-$CN = $1;
+$CN =~ /(\/|,\ )CN=(.*)$/i;
+$CN = $2;
 
 my %confighash = ();
 if (-f "${General::swroot}/ovpn/ovpnconfig"){