diff --git a/CHANGELOG.md b/CHANGELOG.md
index 643697cdc..125cd8929 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@ All notable changes to this project will be documented in this file.
 ### Fixed
 
 ### Removed
+- Display of energy values in GUI use columns when define ``USE_ENERGY_COLUMN_GUI`` is enabled (default)
 
 ## [12.1.1.4] 20221012
 ### Added
@@ -25,6 +26,7 @@ All notable changes to this project will be documented in this file.
 ### Changed
 - ESP32 LVGL library from v8.3.0 to v8.3.2
 - Increase serial console fixed input buffer size from 520 to 800
+- Swap Shelly EM internal channels A and B to match P1 and P2 (#16486)
 
 ## [12.1.1.3] 20221003
 ### Added
diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index c2bcdcb19..2e6e50c30 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -149,6 +149,7 @@ The latter links can be used for OTA upgrades too like ``OtaUrl http://ota.tasmo
 - Button debouncing V3 by adopting switch debounce code [#16339](https://github.com/arendst/Tasmota/issues/16339)
 - Thermostat max allowed temperature from 100 to 200C [#16363](https://github.com/arendst/Tasmota/issues/16363)
 - Using command ``SerialBuffer`` raise max allowed buffer size to 2048 characters [#16374](https://github.com/arendst/Tasmota/issues/16374)
+- Swap Shelly EM internal channels A and B to match P1 and P2 [#16486](https://github.com/arendst/Tasmota/issues/16486)
 - Zigbee report unprocessed attributes
 - ESP32 Increase number of button GPIOs from 8 to 28 [#16518](https://github.com/arendst/Tasmota/issues/16518)
 - ESP32 Platformio one Platform for all Tasmota frameworks Core32 2.0.5 [#16644](https://github.com/arendst/Tasmota/issues/16644)
diff --git a/tasmota/tasmota_xnrg_energy/xnrg_07_ade7953.ino b/tasmota/tasmota_xnrg_energy/xnrg_07_ade7953.ino
index a2ec5564a..dc1fcfc2c 100644
--- a/tasmota/tasmota_xnrg_energy/xnrg_07_ade7953.ino
+++ b/tasmota/tasmota_xnrg_energy/xnrg_07_ade7953.ino
@@ -225,13 +225,13 @@ const uint16_t Ade7953RegistersAis1Bis2[] {
 
 // Active power
 const uint16_t APSIGN[] {
-  0x800, //Bit 10 (21 bits) in ACCMODE Register for channel A (0 - positive, 1 - negative)
-  0x400  //Bit 11 (21 bits) in ACCMODE Register for channel B (0 - positive, 1 - negative)
+  0x0400, //Bit 10 (21 bits) in ACCMODE Register for channel A (0 - positive, 1 - negative)
+  0x0800  //Bit 11 (21 bits) in ACCMODE Register for channel B (0 - positive, 1 - negative)
 };
 // Reactive power
 const uint16_t VARSIGN[] {
-  0x200, //Bit 12 (21 bits) in ACCMODE Register for channel A (0 - positive, 1 - negative)
-  0x100  //Bit 13 (21 bits) in ACCMODE Register for channel B (0 - positive, 1 - negative)
+  0x1000, //Bit 12 (21 bits) in ACCMODE Register for channel A (0 - positive, 1 - negative)
+  0x2000  //Bit 13 (21 bits) in ACCMODE Register for channel B (0 - positive, 1 - negative)
 };
 
 struct Ade7953 {