diff --git a/ssl_mgmt/openssl.cnf.in b/ssl_mgmt/openssl.cnf.in
index 9771a36..d535a54 100644
--- a/ssl_mgmt/openssl.cnf.in
+++ b/ssl_mgmt/openssl.cnf.in
@@ -27,6 +27,7 @@ copy_extensions = copy
 x509_extensions = v3_x509
 
 [ policy_match ]
+localityName = match
 countryName = match
 stateOrProvinceName = match
 organizationName = match
diff --git a/ssl_mgmt/ssl_mgmt b/ssl_mgmt/ssl_mgmt
index d29b9bd..67aee8c 100755
--- a/ssl_mgmt/ssl_mgmt
+++ b/ssl_mgmt/ssl_mgmt
@@ -178,10 +178,10 @@ get_field_from_line ()
 
 	line="$1"
 	field="$2"
-	result="${line#*$field=}"
+	result="$(echo ${line} | sed -r "s/.*${field} *= *//")"
 	if [ "$result" != "$line" ]
 	then
-		echo "${result%%/*}"
+		echo "${result%%,*}"
 	fi
 }