 }
 
 boolean Sonoff::isConfigured() {
-  if (Configuration.wifi_ssid[0] == (char) 0 || Configuration.wifi_password[0] == (char) 0 || Configuration.mqtt_host[0] == (char) 0 || Configuration.mqtt_host[0] == (char) 0 ) {
+  if (Configuration.wifi_ssid[0] == (char) 0 || Configuration.wifi_password[0] == (char) 0) {
     if (Configuration.debugger) Serial << endl << "WARN: Missing configuration. Going to configuration mode.";
     Eeprom.saveMode(MODE_ACCESSPOINT);
     Configuration = Eeprom.getConfiguration();

  if (Configuration.debugger) Serial << endl << "INFO: Device mode: LAN Configuration";
  WiFi.mode(WIFI_STA);
  connectWiFi();
  startHttpServer();
  WiFi.mode(WIFI_STA);
  if (Configuration.debugger) Serial << endl << "INFO: Ready for configuration. Open http://" << WiFi.localIP();
  Led.startBlinking(0.1);
}

void Sonoff::runConfigurationAP() {


  isConfigured();

  /* Code checing if firmware has been upgraded */
  SonoffFirmware Firmware;
  if (Firmware.upgraded()) {
    Firmware.update();
  }
  Firmware = {};

  /* Launch one of the 3 switch modes */
  if (Configuration.mode == MODE_SWITCH) {
    runSwitch();
  } else if (Configuration.mode == MODE_CONFIGURATION) {
