diff --git a/lib/wifi/GWWifi.h b/lib/wifi/GWWifi.h
index bde0a2b..bc75013 100644
--- a/lib/wifi/GWWifi.h
+++ b/lib/wifi/GWWifi.h
@@ -15,6 +15,7 @@ class GwWifi{
         unsigned long apShutdownTime=0;
         bool apActive=false;
         bool fixedApPass=true;
+        bool clientIsConnected=false;
     public:
         GwWifi(const GwConfigHandler *config,GwLog *log, bool fixedApPass=true);
         void setup();
diff --git a/lib/wifi/GwWifi.cpp b/lib/wifi/GwWifi.cpp
index 726d7d9..2190036 100644
--- a/lib/wifi/GwWifi.cpp
+++ b/lib/wifi/GwWifi.cpp
@@ -36,25 +36,39 @@ void GwWifi::setup(){
     if (apShutdownTime < 120 && apShutdownTime != 0) apShutdownTime=120; //min 2 minutes
     logger->logString("GWWIFI: AP auto shutdown %s (%ds)",apShutdownTime> 0?"enabled":"disabled",apShutdownTime);
     apShutdownTime=apShutdownTime*1000; //ms   
+    clientIsConnected=false;
     connectInternal();    
 }
 bool GwWifi::connectInternal(){
     if (wifiClient->asBoolean()){
+        clientIsConnected=false;
         logger->logString("creating wifiClient ssid=%s",wifiSSID->asString().c_str());
-        WiFi.begin(wifiSSID->asCString(),wifiPass->asCString());
+        wl_status_t rt=WiFi.begin(wifiSSID->asCString(),wifiPass->asCString());
+        LOG_DEBUG(GwLog::LOG,"wifiClient connect returns %d",(int)rt);
         lastConnectStart=millis();
         return true;
     }
     return false;
 }
-#define RETRY_MILLIS 10000
+#define RETRY_MILLIS 20000
 void GwWifi::loop(){
-    if (wifiClient->asBoolean() && ! clientConnected()){
-        long now=millis();
-        if (lastConnectStart > now || (lastConnectStart+RETRY_MILLIS) < now){
-            logger->logString("wifiClient: retry connect to %s",wifiSSID->asCString());
-            WiFi.disconnect();
-            connectInternal();
+    if (wifiClient->asBoolean())
+    {
+        if (!clientConnected())
+        {
+            long now = millis();
+            if (lastConnectStart > now || (lastConnectStart + RETRY_MILLIS) < now)
+            {
+                LOG_DEBUG(GwLog::LOG,"wifiClient: retry connect to %s", wifiSSID->asCString());
+                WiFi.disconnect();
+                connectInternal();
+            }
+        }
+        else{
+            if (! clientIsConnected){
+                LOG_DEBUG(GwLog::LOG,"client %s now connected",wifiSSID->asCString());
+                clientIsConnected=true;
+            }
         }
     }
     if (apShutdownTime != 0 && apActive){