diff --git a/include/wifi_functions.h b/include/wifi_functions.h
index 778bd9f..b7b419c 100644
--- a/include/wifi_functions.h
+++ b/include/wifi_functions.h
@@ -48,10 +48,11 @@ void connect() {
   
   if (WiFi.status() == WL_CONNECTED)
   {
-    Serial.print("\nconnecting...");
+    Serial.print("\nconnecting mqtt...");
     timeout=0;
     #define CONNECT_TIMEOUT 5
-    while (!client.connect(client_id, "public", "public") && timeout<CONNECT_TIMEOUT) {
+    //while (!client.connect(client_id, "public", "public") && timeout<CONNECT_TIMEOUT) {
+    while (!client.connect(client_id) && timeout<CONNECT_TIMEOUT) {
         Serial.print(".");
         delay(1000);
         timeout++;
@@ -181,7 +182,7 @@ bool mqtt_loop(unsigned long loopmillis) {
         last_client_loop=loopmillis;
         client.loop();
 
-        if (client.connected()) {
+        if (!client.connected()) {
             if (loopmillis-last_connection_try>RETRY_CONNECTION_INTERVAL) {
               last_connection_try=loopmillis;
               connect();