diff --git a/src/freedombone-utils-wifi b/src/freedombone-utils-wifi
index b3ed757e..8290ce16 100755
--- a/src/freedombone-utils-wifi
+++ b/src/freedombone-utils-wifi
@@ -370,6 +370,8 @@ 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
 
     ctr=0
@@ -384,7 +386,9 @@ function networks_from_file {
                     WIFI_TYPE="$line"
                     if [[ $WIFI_TYPE == $'none' || $WIFI_TYPE == $'open' ]]; then
                         echo 'network={' >> $WIFI_CONFIG
-                        echo "  ssid=\"${WIFI_SSID}\"" >> $WIFI_CONFIG
+                        if [[ "${WIFI_SSID}" != $'any' && "${WIFI_SSID}" != $'all' && "${WIFI_SSID}" != $'open' ]]; then
+                            echo "  ssid=\"${WIFI_SSID}\"" >> $WIFI_CONFIG
+                        fi
                         echo '  key_mgmt=NONE' >> $WIFI_CONFIG
                         echo '}' >> $WIFI_CONFIG
                         ctr=0