diff --git a/package/lean/mt/luci-app-mtwifi/Makefile b/package/lean/mt/luci-app-mtwifi/Makefile
index 984f02f0a..fa3ed725f 100644
--- a/package/lean/mt/luci-app-mtwifi/Makefile
+++ b/package/lean/mt/luci-app-mtwifi/Makefile
@@ -7,7 +7,7 @@ LUCI_TITLE:=LuCI support for mt wifi driver
 LUCI_DEPENDS:=@TARGET_ramips +mt_wifi
 LUCI_PKGARCH:=all
 PKG_VERSION:=1
-PKG_RELEASE:=15
+PKG_RELEASE:=16
 
 define Package/luci-app-mtwifi/conffiles
 /etc/wireless/mt7615/
diff --git a/package/lean/mt/luci-app-mtwifi/luasrc/controller/mtkwifi.lua b/package/lean/mt/luci-app-mtwifi/luasrc/controller/mtkwifi.lua
index 4f66f9b91..4499fc563 100644
--- a/package/lean/mt/luci-app-mtwifi/luasrc/controller/mtkwifi.lua
+++ b/package/lean/mt/luci-app-mtwifi/luasrc/controller/mtkwifi.lua
@@ -791,6 +791,9 @@ function apcli_connect(dev, vif)
         or cfgs.ApCliAuthMode == "WPA1PSKWPA2PSK" then
         os.execute("iwpriv "..vifname.." set ApCliWPAPSK="..cfgs.ApCliWPAPSK)
     end
+    if cfgs.ApCliBssid ~= nil then
+        os.execute("iwpriv "..vifname.." set ApCliBssid="..cfgs.ApCliBssid)
+    end
     os.execute("iwpriv "..vifname.." set ApCliSsid=\""..cfgs.ApCliSsid.."\"")
     os.execute("iwpriv "..vifname.." set ApCliEnable=1")
     luci.http.redirect(luci.dispatcher.build_url("admin", "network", "wifi"))
diff --git a/package/lean/mt/luci-app-mtwifi/luasrc/view/admin_mtk/mtk_wifi_apcli.htm b/package/lean/mt/luci-app-mtwifi/luasrc/view/admin_mtk/mtk_wifi_apcli.htm
index eb5995b86..3828e0ddc 100644
--- a/package/lean/mt/luci-app-mtwifi/luasrc/view/admin_mtk/mtk_wifi_apcli.htm
+++ b/package/lean/mt/luci-app-mtwifi/luasrc/view/admin_mtk/mtk_wifi_apcli.htm
@@ -85,6 +85,13 @@ local debug = 0
                 </td>
                 <td></td>
             </tr>
+            <tr>
+                <td>BSSID</td>
+                <td>
+                    <input type="text" name="ApCliBssid" id="ApCliBssid" value="<%=cfgs.ApCliBssid%>"/>
+                </td>
+                <td><span style="color:green;">可选</span></td>
+            </tr>
             <tr>
                 <td>上级无线信道</td>
                 <td>
@@ -307,6 +314,7 @@ local debug = 0
 
     function choose_rootap(index) {
         document.getElementById("ApCliSsid").value=decode_ssid(ap_list[index].ssid);
+        document.getElementById("ApCliBssid").value=ap_list[index].bssid;
         document.getElementById("Channel").value=ap_list[index].channel;
         document.getElementById("ApCliAuthMode").value=ap_list[index].authmode;
         if (ap_list[index].authmode == "WPA2PSK"
diff --git a/package/lean/mt/luci-app-mtwifi/root/usr/lib/lua/mtkwifi.lua b/package/lean/mt/luci-app-mtwifi/root/usr/lib/lua/mtkwifi.lua
index 418debf90..397cf0060 100644
--- a/package/lean/mt/luci-app-mtwifi/root/usr/lib/lua/mtkwifi.lua
+++ b/package/lean/mt/luci-app-mtwifi/root/usr/lib/lua/mtkwifi.lua
@@ -851,6 +851,10 @@ function mtkwifi.scan_ap(vifname)
             tmp.ssid = mtkwifi.__trim(string.sub(line, xx.SSID[1], xx.SSID[1]+xx.SSID[2]))
             tmp.bssid = string.upper(mtkwifi.__trim(string.sub(line, xx.BSSID[1], xx.BSSID[1]+xx.BSSID[2])))
             tmp.security = mtkwifi.__trim(string.sub(line, xx.Security[1], xx.Security[1]+xx.Security[2]))
+            tmp.security = string.gsub(tmp.security, "WPA1PSKWPA2PSK", "WPAPSKWPA2PSK")
+            if (string.find(tmp.security, "/") == nil) then
+                tmp.security = "OPEN" .. "/" .. tmp.security
+            end
             tmp.authmode = mtkwifi.__trim(string.split(tmp.security, "/")[1])
             tmp.encrypttype = mtkwifi.__trim(string.split(tmp.security, "/")[2] or "NONE")
             tmp.rssi = mtkwifi.__trim(string.sub(line, xx.Signal[1], xx.Signal[1]+xx.Signal[2]))