diff --git a/src/platformio.ini b/src/platformio.ini
index 763ac041..2c6ab3df 100644
--- a/src/platformio.ini
+++ b/src/platformio.ini
@@ -28,7 +28,11 @@ lib_deps =
     https://github.com/esphome/ESPAsyncWebServer @ ^3.2.0
     https://github.com/nRF24/RF24.git#v1.4.8
     paulstoffregen/Time @ ^1.6.1
-    https://github.com/bertmelis/espMqttClient#v1.6.0
+    ;https://github.com/bertmelis/espMqttClient#v1.6.0
+
+    ;TODO: tmp. bug fix, please change it to original later
+    https://github.com/bertmelis/espMqttClient.git#cb0c386    
+    
     bblanchon/ArduinoJson @ ^6.21.3
     https://github.com/JChristensen/Timezone @ ^1.2.4
     olikraus/U8g2 @ ^2.35.9
diff --git a/src/plugins/zeroExport/powermeter.h b/src/plugins/zeroExport/powermeter.h
index bc821b6f..f8b634d2 100644
--- a/src/plugins/zeroExport/powermeter.h
+++ b/src/plugins/zeroExport/powermeter.h
@@ -117,7 +117,8 @@ class powermeter {
 
             if (result) {
                 bufferWrite(power, group);
-
+                mCfg->groups[group].power = power;
+                
                 // MQTT - Powermeter
 /// BUG: 002 Anfang - Muss dieser Teil raus? Führt er zu abstürzen wie BUG 001?
                 if (mMqtt->isConnected()) {
@@ -237,7 +238,8 @@ class powermeter {
 //            }
 
             bufferWrite(power, group);
-
+            mCfg->groups[group].power = power; // TODO: join two sites together (PM & MQTT)
+            
             // MQTT - Powermeter
 /// BUG: 001 Anfang - Dieser Teil ist deaktiviert weil er zu abstürzen der DTU führt
 //            if (mCfg->debug) {
diff --git a/src/web/RestApi.h b/src/web/RestApi.h
index 49a7caff..225ae105 100644
--- a/src/web/RestApi.h
+++ b/src/web/RestApi.h
@@ -843,7 +843,7 @@ class RestApi {
                 objGroup[F("pm_src")]  = String(mConfig->plugin.zeroExport.groups[group].pm_src);
                 objGroup[F("pm_jsonPath")]  = String(mConfig->plugin.zeroExport.groups[group].pm_jsonPath);
                 objGroup[F("pm_user")]  = String(mConfig->plugin.zeroExport.groups[group].pm_user);
-                objGroup[F("pm_pass")]  = String(mConfig->plugin.zeroExport.groups[group].pm_pass);
+                //objGroup[F("pm_pass")]  = String(mConfig->plugin.zeroExport.groups[group].pm_pass); // for security reason
                 objGroup[F("pm_target")] = (uint8_t)mConfig->plugin.zeroExport.groups[group].pm_target;
                 // Inverters
                 objGroup[F("max_inverters")] = ZEROEXPORT_GROUP_MAX_INVERTERS;