diff --git a/tasmota/support_command.ino b/tasmota/support_command.ino
index 4878def08..ca9dbe02b 100644
--- a/tasmota/support_command.ino
+++ b/tasmota/support_command.ino
@@ -908,7 +908,7 @@ bool SetoptionDecode(uint32_t index, uint32_t *ptype, uint32_t *pindex) {
       *ptype = 4;
       *pindex = index -82;      // 0 .. 31
     }
-    else {                                 // SetOption114 .. 145 = Settings->flag5
+    else {                      // SetOption114 .. 145 = Settings->flag5
       *ptype = 5;
       *pindex = index -114;     // 0 .. 31
     }
diff --git a/tasmota/xdrv_03_energy.ino b/tasmota/xdrv_03_energy.ino
index e0a73321c..0cd6c0db1 100644
--- a/tasmota/xdrv_03_energy.ino
+++ b/tasmota/xdrv_03_energy.ino
@@ -984,13 +984,13 @@ void EnergySnsInit(void)
   if (TasmotaGlobal.energy_driver) {
 
     // Update for split phase totals (v9.5.0.9)
-    if ((Settings->energy_kWhtoday > 0) && (0 == Settings->energy_kWhtoday_ph[0])) {
+    if ((Settings->energy_kWhtotal > 0) && (0 == Settings->energy_kWhtotal_ph[0])) {
+      Settings->energy_kWhtotal_ph[0] = Settings->energy_kWhtotal;
       Settings->energy_kWhtoday_ph[0] = Settings->energy_kWhtoday;
       Settings->energy_kWhyesterday_ph[0] = Settings->energy_kWhyesterday;
-      Settings->energy_kWhtotal_ph[0] = Settings->energy_kWhtotal;
       RtcSettings.energy_kWhtoday_ph[0] = RtcSettings.energy_kWhtoday;
       RtcSettings.energy_kWhtotal_ph[0] = RtcSettings.energy_kWhtotal;
-      Settings->energy_kWhtoday = 0;
+      Settings->energy_kWhtotal = 0;
     }
 
 //    Energy.kWhtoday_offset = 0;