diff --git a/src/freedombone-utils-wifi b/src/freedombone-utils-wifi
index 90e6451c..e85ae9f5 100755
--- a/src/freedombone-utils-wifi
+++ b/src/freedombone-utils-wifi
@@ -328,8 +328,14 @@ function wifi_none {
     echo "iface ${WIFI_INTERFACE} inet manual" >> /etc/network/interfaces
     echo "  wpa-roam $WIFI_CONFIG" >> /etc/network/interfaces
 
-    echo 'network={' > $WIFI_CONFIG
-    echo "  ssid=\"${ssid}\"" >> $WIFI_CONFIG
+    echo 'update_config=1' > $WIFI_CONFIG
+    echo 'eapol_version=1' >> $WIFI_CONFIG
+    echo '' >> $WIFI_CONFIG
+
+    echo 'network={' >> $WIFI_CONFIG
+    if [[ "${ssid}" != $'any' && "${ssid}" != $'all' && "${ssid}" != $'open' ]]; then
+        echo "  ssid=\"${ssid}\"" >> $WIFI_CONFIG
+    fi
     echo '  key_mgmt=NONE' >> $WIFI_CONFIG
     echo '}' >> $WIFI_CONFIG
 
@@ -370,7 +376,6 @@ function networks_from_file {
     fi
 
     echo 'update_config=1' > $WIFI_CONFIG
-    echo 'ap_scan=2' >> $WIFI_CONFIG
     echo 'eapol_version=1' >> $WIFI_CONFIG
     echo '' >> $WIFI_CONFIG