diff --git a/general/overlay/etc/network/interfaces.d/wlan0 b/general/overlay/etc/network/interfaces.d/wlan0
index 1351471f..a879a5df 100644
--- a/general/overlay/etc/network/interfaces.d/wlan0
+++ b/general/overlay/etc/network/interfaces.d/wlan0
@@ -1,5 +1,6 @@
+auto wlan0
 iface wlan0 inet dhcp
-    post-up wpa_passphrase "$(fw_printenv -n wlanssid || echo OpenIPC)" "$(fw_printenv -n wlanpass || echo OpenIPC12345)" > /tmp/wpa_supplicant.conf
-    post-up sed -i '2i \\tscan_ssid=1' /tmp/wpa_supplicant.conf
-    post-up wpa_supplicant -B -i wlan0 -D nl80211,wext -c /tmp/wpa_supplicant.conf
+    pre-up wpa_passphrase "$(fw_printenv -n wlanssid || echo OpenIPC)" "$(fw_printenv -n wlanpass || echo OpenIPC12345)" > /tmp/wpa_supplicant.conf
+    pre-up sed -i '2i \\tscan_ssid=1' /tmp/wpa_supplicant.conf
+    pre-up wpa_supplicant -D nl80211,wext -i wlan0 -c /tmp/wpa_supplicant.conf -B
     post-down killall -q wpa_supplicant
diff --git a/general/overlay/etc/wireless/interfaces/wlan0 b/general/overlay/etc/wireless/interfaces/wlan0
index a5b8014f..a879a5df 100644
--- a/general/overlay/etc/wireless/interfaces/wlan0
+++ b/general/overlay/etc/wireless/interfaces/wlan0
@@ -1,6 +1,6 @@
 auto wlan0
 iface wlan0 inet dhcp
-    post-up wpa_passphrase "$(fw_printenv -n wlanssid || echo OpenIPC)" "$(fw_printenv -n wlanpass || echo OpenIPC12345)" > /tmp/wpa_supplicant.conf
-    post-up sed -i '2i \\tscan_ssid=1' /tmp/wpa_supplicant.conf
-    post-up wpa_supplicant -B -i wlan0 -D nl80211,wext -c /tmp/wpa_supplicant.conf
+    pre-up wpa_passphrase "$(fw_printenv -n wlanssid || echo OpenIPC)" "$(fw_printenv -n wlanpass || echo OpenIPC12345)" > /tmp/wpa_supplicant.conf
+    pre-up sed -i '2i \\tscan_ssid=1' /tmp/wpa_supplicant.conf
+    pre-up wpa_supplicant -D nl80211,wext -i wlan0 -c /tmp/wpa_supplicant.conf -B
     post-down killall -q wpa_supplicant
diff --git a/general/package/busybox/busybox.config b/general/package/busybox/busybox.config
index 4f4f2da0..10a8b493 100644
--- a/general/package/busybox/busybox.config
+++ b/general/package/busybox/busybox.config
@@ -995,7 +995,7 @@ CONFIG_UDHCP_DEBUG=0
 CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80
 CONFIG_FEATURE_UDHCP_RFC3397=y
 CONFIG_FEATURE_UDHCP_8021Q=y
-CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-x hostname:$(hostname) -T 1 -t 5 -R -b -O search"
+CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-x hostname:$(hostname) -T 1 -t 15 -R -b -O search"
 
 #
 # Print Utilities