diff --git a/source/_components/climate.nuheat.markdown b/source/_components/climate.nuheat.markdown
index 053cb0c5fdb..01addf47328 100644
--- a/source/_components/climate.nuheat.markdown
+++ b/source/_components/climate.nuheat.markdown
@@ -135,7 +135,7 @@ Returns the maximum supported temperature by the thermostat
 
 The following services are provided by the NuHeat Thermostat: `set_away_mode`, `set_temperature`, `resume_program`.
 
-The services `fan_min_on_time`, `set_aux_heat`, `set_hold_mode`, `set_humidity`, `set_fan_mode`, `set_operation_mode`, and `set_swing_mode` offered by the [Climate component](/components/climate/) are not implemented for this thermostat.
+The services `fan_min_on_time`, `set_aux_heat`, `set_hold_mode`, `set_humidity`, `set_fan_mode`, `set_operation_mode` and `set_swing_mode` offered by the [Climate component](/components/climate/) are not implemented for this thermostat.
 
 ### {% linkable_title Service `set_away_mode` %}
 
diff --git a/source/_components/nuheat.markdown b/source/_components/nuheat.markdown
index cf3405edd19..250f5ec7d7f 100644
--- a/source/_components/nuheat.markdown
+++ b/source/_components/nuheat.markdown
@@ -35,9 +35,17 @@ nuheat:
     - 67890
 ```
 
-Configuration variables:
-
-- **username** (*Required*): The username for accessing your MyNuHeat account.
-- **password** (*Required*): The password for accessing your MyNuHeat account.
-- **devices** (*Required*): The serial number / ID of each thermostat you would like integrate with Home Assistant.
-
+{% configuration %}
+username:
+  description: The username for accessing your MyNuHeat account.
+  required: true
+  type: string
+password:
+  description: The password for accessing your MyNuHeat account.
+  required: true
+  type: string
+devices:
+  description: The serial number / ID of each thermostat you would like integrate with Home Assistant.
+  required: true
+  type: [string, int]
+{% endconfiguration %}