         OLED.clear();
         OLED.setFont( ArialMT_Plain_10 );
         OLED.drawString( 64, 10, "Waiting for SmartConfig." );
-        snprintf( remainingSCTime, sizeof( remainingSCTime), "%i seconds",  ( 100 + rebootTime - millis() ) / 1000 );
+        snprintf( remainingSCTime, sizeof( remainingSCTime), "%i seconds", ( (unsigned long) ( smartConfigStartMs + rebootDelayMs ) - millis() ) / 1000 );
         OLED.drawString( 64, 30, remainingSCTime );
         OLED.invertDisplay();
         OLED.display();

void wifiTask( void * pvParameters )
{
  const uint16_t rebootSeconds = 60 * 5;

  /* trying last accesspoint */
  WiFi.mode( WIFI_STA );
  WiFi.begin();


  if ( WiFi.status() != WL_CONNECTED )
  {
    if ( xTftTaskHandle )
    {
      tft.println( "\nNo WiFi connection.\nWaiting for SmartConfig." );
