diff --git a/easyrsa3/easyrsa b/easyrsa3/easyrsa
index f0d302b..d45ced5 100755
--- a/easyrsa3/easyrsa
+++ b/easyrsa3/easyrsa
@@ -3851,18 +3851,12 @@ recommended - please remove it from there before continuing."
 			fi
 
 			# Warning: Unsupported  characters
-			if  grep '^[[:blank:]]*set_var[[:blank:]][[:blank:]]*.*' "$vars" |
-					grep \
-						-e "EASYRSA_REQ_COUNTRY" \
-						-e "EASYRSA_REQ_PROVINCE" \
-						-e "EASYRSA_REQ_CITY" \
-						-e "EASYRSA_REQ_ORG" \
-						-e "EASYRSA_REQ_EMAIL" \
-						-e "EASYRSA_REQ_OU" |
-						grep -q -e '`' -e '{' -e '}'
+			if grep '^[[:blank:]]*set_var[[:blank:]]*.*$' "$vars" | \
+				grep -q -e '`'
 			then
-				warn 'Unsupported characters are present in the vars file.
-These characters are not supported: (`) "{" "}"
+				warn '\
+Unsupported characters are present in the vars file.
+These characters are not supported: ` backtick
 Sourcing the vars file and building certificates will probably fail ..'
 			fi
 
diff --git a/easyrsa3/vars.example b/easyrsa3/vars.example
index 54e679b..ff8af7c 100644
--- a/easyrsa3/vars.example
+++ b/easyrsa3/vars.example
@@ -94,12 +94,7 @@ fi
 
 # NOTE: The following characters are not supported
 #       in these "Organizational fields" by Easy-RSA:
-#       single quote (')
 #       back-tick (`)
-#       hash (#)
-#       ampersand (&)
-#       dollar sign ($)
-# Use them at your own risk!
 
 #set_var EASYRSA_REQ_COUNTRY	"US"
 #set_var EASYRSA_REQ_PROVINCE	"California"