diff --git a/esphome/riden-labornetzteil-18a.yaml b/esphome/riden-labornetzteil-18a.yaml
index 587c6d1..017f329 100644
--- a/esphome/riden-labornetzteil-18a.yaml
+++ b/esphome/riden-labornetzteil-18a.yaml
@@ -10,7 +10,7 @@ substitutions:
   device_friendly_name: "Riden RD6018"
   device_description: "Monitor and control a RD6018 PSU via WiFi"
   time_timezone: "Europe/Berlin"
-  
+
   # Model specific settings (Don't change these!)
   RD6006_voltage_maximum: "60"
   RD6006_voltage_accuracy: "2"
@@ -20,7 +20,7 @@ substitutions:
   RD6006_current_multiplier: "0.001"
   RD6006_power_accuracy: "2"
   RD6006_power_multiplier: "0.01"
-  
+
   RD6006P_voltage_maximum: "60"
   RD6006P_voltage_accuracy: "3"
   RD6006P_voltage_multiplier: "0.001"
@@ -66,7 +66,7 @@ network:
 wifi:
   ssid: "Voltage-legacy"
   password: !secret voltage_legacy_psk
-  use_address: riden-labornetzteil-18a.home  
+  use_address: riden-labornetzteil-18a.home
   power_save_mode: high
   fast_connect: on
   min_auth_mode: WPA2
@@ -86,7 +86,7 @@ logger:
 
 # Enable Home Assistant API
 api:
-  encryption: 
+  encryption:
     key: !secret apikey
 
 ota:
@@ -159,10 +159,12 @@ sensor:
     register_type: holding
     value_type: U_WORD
     accuracy_decimals: 0
-#    on_value:
-#      then:
-#        - lambda: |-
-#            id(model_name).publish_state(value_accuracy_to_string(x, 0));
+    on_value:
+      then:
+        - lambda: |-
+            id(model_name).publish_state(
+              std::to_string(static_cast<uint16_t>(x))
+            );
 
   - platform: modbus_controller
     name: "Serial Number"
@@ -174,7 +176,7 @@ sensor:
     register_type: holding
     value_type: U_DWORD
     accuracy_decimals: 0
-  
+
   - platform: modbus_controller
     modbus_controller_id: powersupply
     address: 3
@@ -279,7 +281,7 @@ sensor:
     accuracy_decimals: 2
     filters:
       - multiply: 0.01
-  
+
   - platform: modbus_controller
     name: "Temperature"
     device_class: temperature
@@ -289,7 +291,7 @@ sensor:
     address: 4
     value_type: S_DWORD
     unit_of_measurement: "°C"
-    
+
   - platform: modbus_controller
     name: "Temperature external"
     state_class: measurement
@@ -299,7 +301,7 @@ sensor:
     value_type: S_DWORD
     device_class: temperature
     unit_of_measurement: "°C"
-    
+
   - platform: wifi_signal
     name: "Wi-Fi Signal"
     disabled_by_default: True
@@ -418,7 +420,7 @@ number:
     step: ${${model}_voltage_multiplier}
     lambda: !lambda return x * ${${model}_voltage_multiplier};
     write_lambda: !lambda return x * (1/${${model}_voltage_multiplier});
-  
+
   - platform: modbus_controller
     modbus_controller_id: powersupply
     name: "Output current"
@@ -447,7 +449,6 @@ number:
     lambda: !lambda return x * ${${model}_voltage_multiplier};
     write_lambda: !lambda return x * (1/${${model}_voltage_multiplier});
 
-
   - platform: modbus_controller
     modbus_controller_id: powersupply
     name: "Over Current Protection"
diff --git a/esphome/riden-labornetzteil-6a.yaml b/esphome/riden-labornetzteil-6a.yaml
index a582180..1d3bf1e 100644
--- a/esphome/riden-labornetzteil-6a.yaml
+++ b/esphome/riden-labornetzteil-6a.yaml
@@ -10,7 +10,7 @@ substitutions:
   device_friendly_name: "Riden RD6006"
   device_description: "Monitor and control a RD6006 PSU via WiFi"
   time_timezone: "Europe/Berlin"
-  
+
   # Model specific settings (Don't change these!)
   RD6006_voltage_maximum: "60"
   RD6006_voltage_accuracy: "2"
@@ -20,7 +20,7 @@ substitutions:
   RD6006_current_multiplier: "0.001"
   RD6006_power_accuracy: "2"
   RD6006_power_multiplier: "0.01"
-  
+
   RD6006P_voltage_maximum: "60"
   RD6006P_voltage_accuracy: "3"
   RD6006P_voltage_multiplier: "0.001"
@@ -55,7 +55,7 @@ esphome:
   name_add_mac_suffix: false
   project:
     name: "wildekek.rd6006-controller"
-    version: "1.4.1"
+    version: "1.5"
 
 esp8266:
   board: esp12e
@@ -66,7 +66,7 @@ network:
 wifi:
   ssid: "Voltage-legacy"
   password: !secret voltage_legacy_psk
-  use_address: riden-labornetzteil-6a.home  
+  use_address: riden-labornetzteil-6a.home
   power_save_mode: high
   fast_connect: on
   min_auth_mode: WPA2
@@ -86,7 +86,7 @@ logger:
 
 # Enable Home Assistant API
 api:
-  encryption: 
+  encryption:
     key: !secret apikey
 
 ota:
@@ -159,10 +159,12 @@ sensor:
     register_type: holding
     value_type: U_WORD
     accuracy_decimals: 0
-#    on_value:
-#      then:
-#        - lambda: |-
-#            id(model_name).publish_state(value_accuracy_to_string(x, 0));
+    on_value:
+      then:
+        - lambda: |-
+            id(model_name).publish_state(
+              std::to_string(static_cast<uint16_t>(x))
+            );
 
   - platform: modbus_controller
     name: "Serial Number"
@@ -174,7 +176,7 @@ sensor:
     register_type: holding
     value_type: U_DWORD
     accuracy_decimals: 0
-  
+
   - platform: modbus_controller
     modbus_controller_id: powersupply
     address: 3
@@ -279,7 +281,7 @@ sensor:
     accuracy_decimals: 2
     filters:
       - multiply: 0.01
-  
+
   - platform: modbus_controller
     name: "Temperature"
     device_class: temperature
@@ -289,7 +291,7 @@ sensor:
     address: 4
     value_type: S_DWORD
     unit_of_measurement: "°C"
-    
+
   - platform: modbus_controller
     name: "Temperature external"
     state_class: measurement
@@ -299,7 +301,7 @@ sensor:
     value_type: S_DWORD
     device_class: temperature
     unit_of_measurement: "°C"
-    
+
   - platform: wifi_signal
     name: "Wi-Fi Signal"
     disabled_by_default: True
@@ -418,7 +420,7 @@ number:
     step: ${${model}_voltage_multiplier}
     lambda: !lambda return x * ${${model}_voltage_multiplier};
     write_lambda: !lambda return x * (1/${${model}_voltage_multiplier});
-  
+
   - platform: modbus_controller
     modbus_controller_id: powersupply
     name: "Output current"