Index: scripts/wifi_generate_wpa_supplicant.sh
===================================================================
diff -u -r13ac42cf8bdc5038dedd3302ba79dc387e5704b4 -rfa1cf5c0749a6249bec9a5f5653e3a19cbaba24a
--- scripts/wifi_generate_wpa_supplicant.sh	(.../wifi_generate_wpa_supplicant.sh)	(revision 13ac42cf8bdc5038dedd3302ba79dc387e5704b4)
+++ scripts/wifi_generate_wpa_supplicant.sh	(.../wifi_generate_wpa_supplicant.sh)	(revision fa1cf5c0749a6249bec9a5f5653e3a19cbaba24a)
@@ -3,19 +3,34 @@
 password=$2
 dest=$3
 securityType=$4
+psk=$(wpa_passphrase "$ssid" "$password" | grep "psk=" | grep -v "#psk" | sed -nr 's/.*psk=(.*)/\1/p')
 case $securityType in 
-    wpa2|wpa) 
-        echo "Security: wpa2/wpa";
-        psk=$(wpa_passphrase "$ssid" "$password" | grep "psk=" | grep -v "#psk" | sed -nr 's/.*psk=(.*)/\1/p')
+    wpa2)
+        echo "Security: wpa2";
         echo "ctrl_interface=/var/run/wpa_supplicant
 ctrl_interface_group=0
 update_config=1
 
 network={
     ssid=\"$ssid\"
+    key_mgmt=WPA-PSK
+    pairwise=CCMP TKIP
+    group=CCMP TKIP
+    scan_ssid=1
     #psk=\"<password_here>\"
     psk=$psk
 }" > $dest;;
+    wpa) 
+        echo "Security: wpa";
+        echo "ctrl_interface=/var/run/wpa_supplicant
+ctrl_interface_group=0
+update_config=1
+
+network={
+    ssid=\"$ssid\"
+    #psk=\"<password_here>\"
+    psk=$psk
+}" > $dest;;
     wep)
         echo "Security: wep";
         echo "ctrl_interface=/var/run/wpa_supplicant