diff --git a/src/freedombone-utils-firewall b/src/freedombone-utils-firewall
index be7beb57f26ad2360158a5371f4ec6aea577efe2..c80ba7631d175ec18320d85594b54223f4942330 100755
--- a/src/freedombone-utils-firewall
+++ b/src/freedombone-utils-firewall
@@ -139,6 +139,7 @@ function firewall_disable_vpn {
     iptables -t nat -D POSTROUTING -s ${EXTERNAL_IPV4_ADDRESS}/24 -o ${FIREWALL_EIFACE} -j MASQUERADE
     iptables -D OUTPUT -o tun+ -j ACCEPT
     save_firewall_settings
+    sed -i '/VPN=/d' $FIREWALL_CONFIG
 }
 
 function firewall_enable_vpn {
@@ -154,6 +155,7 @@ function firewall_enable_vpn {
     save_firewall_settings
 
     firewall_update_external_ip
+    echo "VPN=1194" >> $FIREWALL_CONFIG
 }
 
 function configure_firewall {