diff --git a/src/hasp_wifi.cpp b/src/hasp_wifi.cpp
index 55de1312..b173f8ba 100644
--- a/src/hasp_wifi.cpp
+++ b/src/hasp_wifi.cpp
@@ -181,12 +181,14 @@ void wifiSetup()
     }
 
     // attempt to connect to Wifi network
-    int status = WL_IDLE_STATUS;     // the Wifi radio's status
-
+    // int status = WL_IDLE_STATUS;     // the Wifi radio's status
+    if(!wifiShowAP()) {
     // while (status != WL_CONNECTED) {
         Log.notice(F("WIFI: Connecting to : %s"), wifiSsid);
         // Connect to WPA/WPA2 network
-        status = WiFi.begin(wifiSsid, wifiPassword);
+        // status = WiFi.begin(wifiSsid, wifiPassword);
+        WiFi.begin(wifiSsid, wifiPassword);
+    }
     // }
 
 #else
@@ -214,7 +216,9 @@ void wifiSetup()
 bool wifiEvery5Seconds()
 {
 #if defined(STM32F4xx)
-    if(WiFi.status() == WL_CONNECTED) {
+    if(wifiShowAP()) { // no ssid is set yet wait for user on-screen input
+        return false;
+    } else if(WiFi.status() == WL_CONNECTED) {
 #else
     if(WiFi.getMode() != WIFI_STA) {
         return false;