diff --git a/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua b/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua
index c9a264ed8..5de2cda24 100644
--- a/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua
+++ b/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua
@@ -396,6 +396,9 @@ function wizard_add()
 		vpn_port = 65301
 		vpn_intf = "tun0"
 		ucic:set("network","omrvpn","proto","dhcp")
+	elseif default_vpn == "openvpn_bonding" then
+		vpn_intf = "bonding-omrvpn"
+		ucic:set("network","omrvpn","proto","bonding")
 	end
 	if vpn_intf ~= "" then
 		ucic:set("network","omrvpn","ifname",vpn_intf)
diff --git a/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js b/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js
index d3f564d47..dafb89b26 100644
--- a/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js
+++ b/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js
@@ -491,7 +491,8 @@ return view.extend({
 		so.datatype = 'or(ip4addr,"ignore")';
 		so.rmempty = true;
 
-		so = ss.option(form.Value, 'leasetime', _('Lease time'));
+		so = ss.option(form.Value, 'leasetime', _('Lease time'), _('The lease time is in seconds, or minutes (eg 45m) or hours (eg 1h) or "infinite"'));
+		so.placeholder = '12h';
 		so.rmempty = true;
 
 		so = ss.option(form.Value, 'duid', _('<abbr title="The DHCP Unique Identifier">DUID</abbr>'));
diff --git a/omr-tracker/files/bin/omr-tracker b/omr-tracker/files/bin/omr-tracker
index 8b64a3785..d2211fcb5 100755
--- a/omr-tracker/files/bin/omr-tracker
+++ b/omr-tracker/files/bin/omr-tracker
@@ -189,6 +189,9 @@ while true; do
 			#if [ -z "$OMR_TRACKER_DEVICE_GATEWAY" ]; then
 			#	OMR_TRACKER_DEVICE_GATEWAY=$(ip -4 r list dev "$OMR_TRACKER_DEVICE" | grep -v default | awk '/proto static/ {print $1}' | tr -d "\n")
 			#fi
+			if [ "$OMR_TRACKER_DEVICE" = "bonding-omrvpn" ]; then
+				OMR_TRACKER_DEVICE_GATEWAY="10.255.248.1"
+			fi
 			if [ -z "$OMR_TRACKER_DEVICE_GATEWAY" ]; then
 				OMR_TRACKER_DEVICE_GATEWAY=$(uci -q get "network.$OMR_TRACKER_INTERFACE.gateway")
 			fi
diff --git a/openmptcprouter/files/etc/init.d/openvpnbonding b/openmptcprouter/files/etc/init.d/openvpnbonding
index 864a67eeb..d36eeb584 100755
--- a/openmptcprouter/files/etc/init.d/openvpnbonding
+++ b/openmptcprouter/files/etc/init.d/openvpnbonding
@@ -77,8 +77,14 @@ start_service()
 			set network.omrvpn.updelay='20'
 			set network.omrvpn.use_carrier='1'
 			set network.omrvpn.mtu='1440'
+			set network.omrvpn.ifname= 'bonding-omrvpn'
+			set network.omrvpn.force_link='1'
 			commit network
 		EOF
+		if [ "$(ip link show bonding-omrvpn)" = "" ]; then
+			/etc/init.d/network restart
+			sleep 10
+		fi
 		config_load openmptcprouter
 		config_foreach _openvpnbonding interface
 		ip link set bonding-omrvpn up