diff --git a/openvpn-install.sh b/openvpn-install.sh
index 458a95e..cd97b87 100755
--- a/openvpn-install.sh
+++ b/openvpn-install.sh
@@ -645,6 +645,8 @@ function installOpenVPN() {
 		CLIENT=${CLIENT:-client}
 		PASS=${PASS:-1}
 		CONTINUE=${CONTINUE:-y}
+		CLIENT_TO_CLIENT_OPTION="y"
+		ADDPORT="y"
 
 		# Behind NAT, we'll default to the publicly reachable IPv4/IPv6.
 		if [[ $IPV6_SUPPORT == "y" ]]; then