diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 7bbb495c2..75e063fc1 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -47,6 +47,8 @@ jobs:
         OMR_FEED_URL: https://github.com/ysurac/openmptcprouter-feeds
         SOURCE_NAME: ${{ steps.branch_name.outputs.SOURCE_NAME }}
         OMR_TARGET: ${{ matrix.OMR_TARGET }}
+        OMR_HOST: ${{ secrets.OMR_HOST }}
+        OMR_PORT: ${{ secrets.OMR_PORT }}
       run: |
         OMR_FEED_SRC="${SOURCE_NAME}" sh build.sh prepare {tools,toolchain}/install -j$(nproc) || OMR_FEED_SRC="${SOURCE_NAME}" sh build.sh prepare {tools,toolchain}/install -j1 V=s
         #echo -e "${{ secrets.OMR_PRIVKEY }}" > $OMR_TARGET/source/key-build
diff --git a/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua b/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua
index cad43d555..f25577034 100644
--- a/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua
+++ b/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua
@@ -230,16 +230,18 @@ function wizard_add()
 		local sqmenabled = luci.http.formvalue("cbid.sqm.%s.enabled" % intf) or "0"
 		local multipath = luci.http.formvalue("cbid.sqm.%s.multipath" % intf) or "on"
 		local lan = luci.http.formvalue("cbid.sqm.%s.lan" % intf) or "0"
-		if typeintf == "normal" then
-			typeintf = ""
+		if typeintf ~= "" then
+			if typeintf == "normal" then
+				typeintf = ""
+			end
+			ucic:set("network",intf,"type",typeintf)
 		end
-		ucic:set("network",intf,"type",typeintf)
-		if typeintf == "macvlan" then
+		if typeintf == "macvlan" and masterintf ~= "" then
 			ucic:set("network",intf,"type","macvlan")
 			ucic:set("network",intf,"masterintf",masterintf)
-		elseif typeintf == "" and (proto == "static" or proto == "dhcp" ) then
+		elseif typeintf == "" and ifname ~= "" and (proto == "static" or proto == "dhcp" ) then
 			ucic:set("network",intf,"ifname",ifname)
-		elseif typeintf == "" and (proto == "ncm" or proto == "qmi" or proto == "modemmanager") then
+		elseif typeintf == "" and device ~= "" and (proto == "ncm" or proto == "qmi" or proto == "modemmanager") then
 			ucic:set("network",intf,"device",device)
 		end
 		if proto ~= "other" then