diff --git a/code/espurna/emon.ino b/code/espurna/emon.ino
index 7b9eabf0..62d1abf0 100644
--- a/code/espurna/emon.ino
+++ b/code/espurna/emon.ino
@@ -171,6 +171,10 @@ void powerMonitorLoop() {
                 char buffer[20];
                 snprintf(buffer, 20, "%s;%s", power, e);
                 domoticzSend("dczPowIdx", 0, buffer);
+                snprintf(buffer, 20, "%d", voltage);
+                domoticzSend("dczVoltIdx", 0, buffer);
+                snprintf(buffer, 20, "%s", String(current).c_str());
+                domoticzSend("dczCurrentIdx", 0, buffer);
             }
             #endif
 
diff --git a/code/espurna/pow.ino b/code/espurna/pow.ino
index 955352d8..08dfba31 100644
--- a/code/espurna/pow.ino
+++ b/code/espurna/pow.ino
@@ -239,6 +239,8 @@ void powLoop() {
                 domoticzSend("dczPowIdx", 0, buffer);
                 snprintf(buffer, 20, "%d", voltage);
                 domoticzSend("dczVoltIdx", 0, buffer);
+                snprintf(buffer, 20, "%s", String(current).c_str());
+                domoticzSend("dczCurrentIdx", 0, buffer);
             }
             #endif
 
diff --git a/code/espurna/web.ino b/code/espurna/web.ino
index 398da69b..1f647524 100644
--- a/code/espurna/web.ino
+++ b/code/espurna/web.ino
@@ -350,11 +350,14 @@ void _wsStart(uint32_t client_id) {
 
         #if ENABLE_EMON
             root["dczPowIdx"] = getSetting("dczPowIdx").toInt();
+            root["dczVoltIdx"] = getSetting("dczVoltIdx").toInt();
+            root["dczCurrentIdx"] = getSetting("dczCurrentIdx").toInt();
         #endif
 
         #if ENABLE_POW
             root["dczPowIdx"] = getSetting("dczPowIdx").toInt();
             root["dczVoltIdx"] = getSetting("dczVoltIdx").toInt();
+            root["dczCurrentIdx"] = getSetting("dczCurrentIdx").toInt();
         #endif
 
     #endif
diff --git a/code/html/index.html b/code/html/index.html
index 116a6df7..b0206acb 100644
--- a/code/html/index.html
+++ b/code/html/index.html
@@ -409,12 +409,18 @@
                                     <div class="pure-u-1 pure-u-sm-5-8 hint center">Set to 0 to disable notifications.</div>
                                 </div>
 
-                                <div class="pure-g module module-pow">
+                                <div class="pure-g module module-pow module-emon">
                                     <label class="pure-u-1 pure-u-sm-1-4" for="dczVoltIdx">Voltage IDX</label>
                                     <div class="pure-u-1 pure-u-sm-1-8"><input class="pure-u-sm-23-24" name="dczVoltIdx" type="number" min="0" tabindex="36" data="0" /></div>
                                     <div class="pure-u-1 pure-u-sm-5-8 hint center">Set to 0 to disable notifications.</div>
                                 </div>
 
+                                <div class="pure-g module module-pow module-emon">
+                                    <label class="pure-u-1 pure-u-sm-1-4" for="dczCurrentIdx">Current IDX</label>
+                                    <div class="pure-u-1 pure-u-sm-1-8"><input class="pure-u-sm-23-24" name="dczCurrentIdx" type="number" min="0" tabindex="36" data="0" /></div>
+                                    <div class="pure-u-1 pure-u-sm-5-8 hint center">Set to 0 to disable notifications.</div>
+                                </div>
+
                                 <div id="idxs">
                                 </div>