diff --git a/ha-smart-thermostat-control.yaml b/ha-smart-thermostat-control.yaml
index a9a0e7c..165dc0b 100644
--- a/ha-smart-thermostat-control.yaml
+++ b/ha-smart-thermostat-control.yaml
@@ -221,6 +221,8 @@ variables:
   day_temp_input: !input day_temp
   night_temp_input: !input night_temp
   away_temp_input: !input away_temp
+  schedule_helper_id: !input schedule_helper
+  away_calendar_id: !input away_calendar
 
 condition: []
 
@@ -236,9 +238,9 @@ action:
           # Only if the new temp is different from current schedule targets
           - condition: template
             value_template: >
-              {% if is_state(input_away_calendar, 'on') %}
+              {% if is_state(away_calendar_id, 'on') %}
                 {{ (new_temperature - away_temp_input) | abs > 0.1 }}
-              {% elif is_state(input_schedule_helper, 'on') %}
+              {% elif is_state(schedule_helper_id, 'on') %}
                 {{ (new_temperature - day_temp_input) | abs > 0.1 }}
               {% else %}
                 {{ (new_temperature - night_temp_input) | abs > 0.1 }}