diff --git a/root/etc/init.d/easymesh b/root/etc/init.d/easymesh
index 7bd7439..047efd5 100755
--- a/root/etc/init.d/easymesh
+++ b/root/etc/init.d/easymesh
@@ -259,32 +259,40 @@ set_easymesh() {
 		add_dawn
 
 		if [ "$ap_mode" = 1 ]; then
-cp /etc/config/wireless /etc/config/wireless.backup
-cp /etc/config/network /etc/config/network.backup
-uci set wireless.mesh_$apall.mesh_fwding='1'
-for i in firewall dnsmasq odhcpd; do
-  if /etc/init.d/"$i" enabled; then
-    /etc/init.d/"$i" disable
-    /etc/init.d/"$i" stop
-  fi
-done
-
-echo switching the lan interface to DHCP client
-uci set network.lan.proto='dhcp'
-uci delete network.wan
-uci delete network.wan6
-uci delete network.lan.ipaddr
-uci delete network.lan.netmask
-uci set system.@system[0].hostname=$gateway
-uci commit
-
-echo removing firewall config
-mv /etc/config/firewall /etc/config/firewall.restore
-
-# reboot the device
-
-reboot
-fi
+            cp /etc/config/wireless /etc/config/wireless.backup
+            cp /etc/config/network /etc/config/network.backup
+			uci set network.lan.type='bridge'
+            # assign WAN physical interface to LAN (will be available as an additional LAN port now)
+            uci set network.lan.ifname="$(uci get network.lan.ifname) $(uci get network.wan.ifname)"
+            uci del network.wan.ifname
+            # Remove wan logical interface, since we will not need it.
+            uci del network.wan
+            uci set wireless.mesh_$apall.mesh_fwding='1'
+            uci commit dhcp; echo '' > /etc/config/dhcp
+            /etc/init.d/dnsmasq disable
+            /etc/init.d/dnsmasq stop
+
+            echo switching the lan interface to DHCP client
+            uci del network.lan.broadcast
+            uci del network.lan.dns
+            uci del network.lan.gateway
+            uci del network.lan.ipaddr
+            uci del network.lan.netmask
+            uci set network.lan.proto='dhcp'
+            uci set system.@system[0].hostname=$gateway
+            uci set network.lan.hostname="`uci get system.@system[0].hostname`"
+
+            uci commit
+            sync
+            /etc/init.d/network restart
+
+            echo removing firewall config
+            mv /etc/config/firewall /etc/config/firewall.restore
+
+            # reboot the device
+
+            reboot
+       fi
 
 		else
 			ap_mode_stop