diff --git a/src/www/vpn_openvpn_client.php b/src/www/vpn_openvpn_client.php
index 3a469d326..62b128a21 100644
--- a/src/www/vpn_openvpn_client.php
+++ b/src/www/vpn_openvpn_client.php
@@ -264,7 +264,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
 
 					foreach (explode(",",$copy_fields) as $fieldname) {
 						$fieldname = trim($fieldname);
-						if(isset($pconfig[$fieldname])) {
+						if(!empty($pconfig[$fieldname])) {
 							$client[$fieldname] = $pconfig[$fieldname];
 						}
 					}
diff --git a/src/www/vpn_openvpn_csc.php b/src/www/vpn_openvpn_csc.php
index 2d493932a..1e3058152 100644
--- a/src/www/vpn_openvpn_csc.php
+++ b/src/www/vpn_openvpn_csc.php
@@ -167,7 +167,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
 						// 1 on 1 copy of config attributes
 						foreach (explode(",",$all_form_fields) as $fieldname) {
 								$fieldname = trim($fieldname);
-								if(isset($pconfig[$fieldname])) {
+								if(!empty($pconfig[$fieldname])) {
 										$csc[$fieldname] = $pconfig[$fieldname];
 								}
 						}
diff --git a/src/www/vpn_openvpn_server.php b/src/www/vpn_openvpn_server.php
index 81ff11b53..f6b4b20a1 100644
--- a/src/www/vpn_openvpn_server.php
+++ b/src/www/vpn_openvpn_server.php
@@ -329,7 +329,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
 
 						foreach (explode(",",$copy_fields) as $fieldname) {
 							$fieldname = trim($fieldname);
-							if(isset($pconfig[$fieldname])) {
+							if(!empty($pconfig[$fieldname])) {
 								$server[$fieldname] = $pconfig[$fieldname];
 							}
 						}