diff --git a/luci-app-passwall/root/etc/uci-defaults/luci-passwall b/luci-app-passwall/root/etc/uci-defaults/luci-passwall
index 245e4cdb..2a5a3240 100755
--- a/luci-app-passwall/root/etc/uci-defaults/luci-passwall
+++ b/luci-app-passwall/root/etc/uci-defaults/luci-passwall
@@ -3,20 +3,24 @@
 uci -q batch <<-EOF >/dev/null
 	set dhcp.@dnsmasq[0].localuse=1
 	commit dhcp
+	[ -e "/etc/config/ucitrack" ] && {
 	delete ucitrack.@passwall[-1]
 	add ucitrack passwall
 	set ucitrack.@passwall[-1].init=passwall
 	commit ucitrack
+	}
 	delete firewall.passwall
 	set firewall.passwall=include
 	set firewall.passwall.type=script
 	set firewall.passwall.path=/var/etc/passwall.include
 	set firewall.passwall.reload=1
 	commit firewall
+	[ -e "/etc/config/ucitrack" ] && {
 	delete ucitrack.@passwall_server[-1]
 	add ucitrack passwall_server
 	set ucitrack.@passwall_server[-1].init=passwall_server
 	commit ucitrack
+	}
 	delete firewall.passwall_server
 	set firewall.passwall_server=include
 	set firewall.passwall_server.type=script
diff --git a/luci-app-passwall/root/usr/share/ucitrack/luci-app-passwall-server.json b/luci-app-passwall/root/usr/share/ucitrack/luci-app-passwall-server.json
new file mode 100644
index 00000000..257e61be
--- /dev/null
+++ b/luci-app-passwall/root/usr/share/ucitrack/luci-app-passwall-server.json
@@ -0,0 +1,4 @@
+{
+	"config": "passwall_server",
+	"init": "passwall_server"
+}
diff --git a/luci-app-passwall/root/usr/share/ucitrack/luci-app-passwall.json b/luci-app-passwall/root/usr/share/ucitrack/luci-app-passwall.json
new file mode 100644
index 00000000..b3b7140e
--- /dev/null
+++ b/luci-app-passwall/root/usr/share/ucitrack/luci-app-passwall.json
@@ -0,0 +1,4 @@
+{
+	"config": "passwall",
+	"init": "passwall"
+}