diff --git a/post-install.sh b/post-install.sh
index 93543d7..b9bc934 100644
--- a/post-install.sh
+++ b/post-install.sh
@@ -63,6 +63,8 @@ fi
 
 ### Finally make sure basic configuration is set correctly
 
+/etc/init.d/wifibox enable
+
 if [ -z "$IPKG_INSTROOT" ]; then
 	echo "Enabling wifi device..."
 	uci set wireless.@wifi-device[0].disabled=0; uci commit wireless; wifi
@@ -71,8 +73,6 @@ if [ -z "$IPKG_INSTROOT" ]; then
 
 	echo "Adding network interface 'wlan'..."
 	uci set network.wlan=interface; uci commit network; /etc/init.d/network reload
-
-	/etc/init.d/wifibox enable
 	
 else
 	# Create a script to setup the system as wifibox, it will be deleted after it has been run, except if it returns > 0
diff --git a/src/network/netconfig.lua b/src/network/netconfig.lua
index 63b9a5a..506fc0c 100644
--- a/src/network/netconfig.lua
+++ b/src/network/netconfig.lua
@@ -150,7 +150,7 @@ end
 
 --[[ Add/remove DHCP pool for wireless net ]]
 function reconf.dhcppool_add(dirtyList)
-	uci:set('dhcp', wifi.getDeviceName(), 'dhcp') --create section
+	uci:set('dhcp', wifi.NET, 'dhcp') --create section
 	M.uciTableSet('dhcp', wifi.NET, {
 		interface = wifi.NET,
 		start = '100',