diff --git a/openmptcprouter/files/etc/init.d/openmptcprouter-vps b/openmptcprouter/files/etc/init.d/openmptcprouter-vps
index 2faabc2c4..0f960c4bd 100755
--- a/openmptcprouter/files/etc/init.d/openmptcprouter-vps
+++ b/openmptcprouter/files/etc/init.d/openmptcprouter-vps
@@ -485,12 +485,10 @@ _vps_firewall_redirect_port() {
 }
 
 _vps_firewall_close_port() {
-	echo "$vpsfwlist"
 	echo "$vpsfwlist" | while read -r line; do
-		echo "line: $line"
 		[ -n "$line" ] && {
 			proto=$(echo $line | awk '{print $4}')
-			src_port=$(echo $line | awk '{print $5}')
+			src_dport=$(echo $line | awk '{print $5}')
 			settings='{"name" : "router '$src_dport'","port" : "'$src_dport'","proto" : "'$proto'","fwtype" : "DNAT"}'
 			_set_json "shorewallclose" "$settings"
 		}
@@ -786,6 +784,10 @@ _set_config_from_vps() {
 			set openmptcprouter.settings.disable_ipv6=1
 		EOF
 		sysctl -qw net.ipv6.conf.all.disable_ipv6=1
+	else
+		uci -q batch <<-EOF >/dev/null
+			set openmptcprouter.${servername}.ipv6=$vps_ipv6_addr
+		EOF
 	fi
 
 	# Get VPS iperf config
diff --git a/openmptcprouter/files/etc/uci-defaults/1980-omr-firewall b/openmptcprouter/files/etc/uci-defaults/1980-omr-firewall
index 26dc20653..1958eb45b 100755
--- a/openmptcprouter/files/etc/uci-defaults/1980-omr-firewall
+++ b/openmptcprouter/files/etc/uci-defaults/1980-omr-firewall
@@ -85,11 +85,11 @@ if [ "$(ubus call system board | jsonfilter -e '@.board_name')" = "bananapi,bpi-
 	EOF
 fi
 
-if [ "$(uci -q get firewall.omr-server)" = "" ]; then
+if [ "$(uci -q get firewall.omr_server)" = "" ]; then
 	uci -q batch <<-EOF >/dev/null
-		set firewall.omr-server=include
-		set firewall.omr-server.path=/etc/firewall.omr-server
-		set firewall.omr-server.reload=1
+		set firewall.omr_server=include
+		set firewall.omr_server.path=/etc/firewall.omr-server
+		set firewall.omr_server.reload=1
 		commit firewall
 	EOF
 fi