diff --git a/generate-client.sh b/generate-client.sh
index 602ffc1..4fe13a8 100755
--- a/generate-client.sh
+++ b/generate-client.sh
@@ -25,8 +25,8 @@ mkdir -p /etc/openvpn/client
 cat > /etc/openvpn/client/$CLIENT_NAME.ovpn << EOL
 client
 dev tun
-proto udp
-remote $(curl -s ifconfig.me) 1194
+proto udp4
+remote $(curl -s -4 ifconfig.me) 1194
 resolv-retry infinite
 nobind
 persist-key
diff --git a/setup_openvpn.sh b/setup_openvpn.sh
index 8baa3dc..e8af481 100755
--- a/setup_openvpn.sh
+++ b/setup_openvpn.sh
@@ -75,7 +75,7 @@ cp pki/dh.pem /etc/openvpn/server/
 echo "Creating server configuration..."
 cat > /etc/openvpn/server/server.conf << EOF
 port 1194
-proto udp
+proto udp4
 dev tun
 ca /etc/openvpn/server/ca.crt
 cert /etc/openvpn/server/server.crt
@@ -166,8 +166,8 @@ mkdir -p /etc/openvpn/client
 cat > /etc/openvpn/client/$CLIENT_NAME.ovpn << EOL
 client
 dev tun
-proto udp
-remote \$(curl -s ifconfig.me) 1194
+proto udp4
+remote \$(curl -s -4 ifconfig.me) 1194
 resolv-retry infinite
 nobind
 persist-key
@@ -190,7 +190,13 @@ dhcp-option DNS 1.0.0.1
 </key>
 EOL
 
+# Copy the configuration file to the current working directory
+WORKING_DIR=\$(dirname \$(readlink -f \$0))
+cp /etc/openvpn/client/\$CLIENT_NAME.ovpn \$WORKING_DIR/
+chmod 644 \$WORKING_DIR/\$CLIENT_NAME.ovpn
+
 echo "Client configuration created: /etc/openvpn/client/\$CLIENT_NAME.ovpn"
+echo "A copy has also been saved to: \$WORKING_DIR/\$CLIENT_NAME.ovpn"
 ENDOFFILE
 
 chmod +x /etc/openvpn/server/generate-client.sh