diff --git a/usr/local/www/vpn_openvpn_client.php b/usr/local/www/vpn_openvpn_client.php
index 87832f409b..b7e48c02b5 100644
--- a/usr/local/www/vpn_openvpn_client.php
+++ b/usr/local/www/vpn_openvpn_client.php
@@ -132,7 +132,8 @@ if ($_POST) {
 		if ($result = openvpn_validate_port($pconfig['local_port'], 'Local port'))
 			$input_errors[] = $result;
 
-		if (openvpn_port_used($pconfig['protocol'], $pconfig['local_port']) != $vpnid)
+		$portused = openvpn_port_used($pconfig['protocol'], $pconfig['local_port']);
+		if (($portused != $vpnid) && ($portused != 0))
 			$input_errors[] = "The specified 'Local port' is in use. Please select another value";
 	}
 
diff --git a/usr/local/www/vpn_openvpn_server.php b/usr/local/www/vpn_openvpn_server.php
index f6a0a8db24..3da69aeb56 100644
--- a/usr/local/www/vpn_openvpn_server.php
+++ b/usr/local/www/vpn_openvpn_server.php
@@ -177,7 +177,8 @@ if ($_POST) {
 	if ($result = openvpn_validate_cidr($pconfig['local_network'], 'Local network'))
 		$input_errors[] = $result;
 
-	if (openvpn_port_used($pconfig['protocol'], $pconfig['local_port']) != $vpnid)
+	$portused = openvpn_port_used($pconfig['protocol'], $pconfig['local_port']);
+	if (($portused != $vpnid) && ($portused != 0))
 		$input_errors[] = "The specified 'Local port' is in use. Please select another value";
 
 	if (!$tls_mode && !$pconfig['autokey_enable'])