diff --git a/library.json b/library.json
index 97f2f20..bc41079 100644
--- a/library.json
+++ b/library.json
@@ -12,7 +12,7 @@
     "type": "git",
     "url": "http://git.xpablo.cz/pablo2048/WiFiConfig.git"
   },
-  "version": "6.0",
+  "version": "6.3",
   "license": "MIT",
   "frameworks": "arduino",
   "platforms": ["espressif8266", "espressif32"],
diff --git a/library.properties b/library.properties
index 81d4c67..62ceb51 100644
--- a/library.properties
+++ b/library.properties
@@ -1,5 +1,5 @@
 name=WiFiConfig
-version=6.0
+version=6.3
 author=Pavel Brychta
 maintainer=Pavel Brychta <Pablo@xpablo.cz>
 sentence=Enables seamless module configuration.
diff --git a/src/WiFiConfig.cpp b/src/WiFiConfig.cpp
index 8094c5e..b3a23d2 100644
--- a/src/WiFiConfig.cpp
+++ b/src/WiFiConfig.cpp
@@ -24,7 +24,7 @@
  *
  * V5.3 - 8.12.2017 - prepracovano presmerovani v Captive portalu, DEBUG_MSG makro upraveno na posledni pouzivanou verzi, scitani retezcu prepracovano na .concat. Pripsany Informace o modulu, reakce na Reset
  *
- * V5.2 - 20.4.2017 - Pokud je pouzite v timeoutu EC_DONT_RUN_CONFIGAP tak se vracime okamzite a necekame na pripojeni k WiFi (take nevolame zadnou callback metodu).
+ * V5.2 - 20.4.2017 - Pokud je pouzite v timeoutu WC_DONT_RUN_CONFIGAP tak se vracime okamzite a necekame na pripojeni k WiFi (take nevolame zadnou callback metodu).
  *            Navratovy kod je pak WCR_CONFIGAP_NOT_STARTED .
  *
  * V5.1 - 3.4.2017  - Webove rozhrani upravene pro snadnejsi ovladani na telefonu/tabletu, sila signalu AP zobrazena jako barevne odliseny indikator.
@@ -921,6 +921,8 @@ wificonfigresult_t WiFiConfig::begin(int configarea, int forceConfigure, int tim
 
   if ((timeout > 0) && (40 > timeout))
     timeout = 40; // timeout musi byt minimalne 40 sekund
+  if ((0 == forceConfigure) && (WC_DONT_RUN_CONFIGAP == timeout))
+    timeout = 40;
   _timeout = timeout;
   if (_timeout > 0)
     _time = millis() + (_timeout * 1000); // spocitame si novy cas, kdy budeme modul restartovat