diff --git a/luci-app-wizard/root/etc/init.d/wizard b/luci-app-wizard/root/etc/init.d/wizard
index 040b53ca6..6fba400ce 100644
--- a/luci-app-wizard/root/etc/init.d/wizard
+++ b/luci-app-wizard/root/etc/init.d/wizard
@@ -110,7 +110,7 @@ add_wizard() {
 	uci -q get wireless.${radio} >/dev/null 2>&1 && {
 		if [ "$(uci -q get wireless.${radio}.band)" = "5g" ]; then
 			uci -q set wireless.default_${radio}.ssid="${wifi_ssid}_5G"
-		else
+		elif [ "$(uci -q get wireless.${radio}.band)" = "2g" ]; then
 			uci -q set wireless.default_${radio}.ssid="${wifi_ssid}_2.4G"
 		fi
 			uci -q set wireless.default_${radio}.device="${radio}"
@@ -134,6 +134,8 @@ add_wizard() {
 			wifi_setup_radio ${radio}
 		done
 		uci commit wireless
+		uci -q set wizard.default.old_wifi_ssid="${wifi_ssid}"
+		uci -q set wizard.default.old_wifi_key="${wifi_key}"
 	}
 	fi
 
diff --git a/nikki/files/uci-defaults/migrate.sh b/nikki/files/uci-defaults/migrate.sh
index 1326cb9f2..5f084913d 100644
--- a/nikki/files/uci-defaults/migrate.sh
+++ b/nikki/files/uci-defaults/migrate.sh
@@ -62,7 +62,9 @@ proxy_transparent_proxy=$(uci -q get nikki.proxy.transparent_proxy); [ -n "$prox
 
 	uci add_list nikki.proxy.lan_inbound_interface=lan
 
-	proxy_access_control_mode=$(uci -q get nikki.proxy.access_control_mode); [ "$proxy_access_control_mode" != "all" ] && {
+	proxy_access_control_mode=$(uci -q get nikki.proxy.access_control_mode)
+
+	[ "$proxy_access_control_mode" != "all" ] && {
 		proxy_acl_ip=$(uci -q get nikki.proxy.acl_ip); [ -n "$proxy_acl_ip" ] && {
 			for ip in $proxy_acl_ip; do
 				uci add nikki lan_access_control
@@ -90,11 +92,12 @@ proxy_transparent_proxy=$(uci -q get nikki.proxy.transparent_proxy); [ -n "$prox
 				[ "$proxy_access_control_mode" == "block" ] && uci set nikki.@lan_access_control[-1].proxy=0
 			done
 		}
-		[ "$proxy_access_control_mode" == "block" ] && {
-			uci add nikki lan_access_control
-			uci set nikki.@lan_access_control[-1].enabled=1
-			uci set nikki.@lan_access_control[-1].proxy=1
-		}
+	}
+
+	[ "$proxy_access_control_mode" != "allow" ] && {
+		uci add nikki lan_access_control
+		uci set nikki.@lan_access_control[-1].enabled=1
+		uci set nikki.@lan_access_control[-1].proxy=1
 	}
 
 	uci del nikki.proxy.access_control_mode
diff --git a/nikki/files/ucode/hijack.ut b/nikki/files/ucode/hijack.ut
index e69faac1f..83554b304 100644
--- a/nikki/files/ucode/hijack.ut
+++ b/nikki/files/ucode/hijack.ut
@@ -305,7 +305,7 @@ table inet nikki {
 		{% for (let access_control in lan_access_control): %}
 		{% if (access_control['enabled']): %}
 		{% if (length(access_control['ip']) == 0 && length(access_control['ip6']) == 0 && length(access_control['mac']) == 0): %}
-		meta l4proto tcp tcp counter {% if (access_control.proxy == '1'): %} redirect to :{{ redir_port }} {% else %} counter return {% endif %}
+		meta l4proto tcp counter {% if (access_control.proxy == '1'): %} redirect to :{{ redir_port }} {% else %} counter return {% endif %}
 
 		{% else %}
 		{% if (length(access_control['ip']) > 0): %}