diff --git a/states/zabbix/init.sls b/states/zabbix/init.sls
index 5bd1996..8462605 100644
--- a/states/zabbix/init.sls
+++ b/states/zabbix/init.sls
@@ -13,7 +13,7 @@ include:
 
 ## for upgrade
 zabbix-agent-service:
-  service.stopped:
+  service.dead:
     - name: zabbix-agent
     - enable: false
 {% endif %}
diff --git a/states/zabbix/templates/user_parameters.j2 b/states/zabbix/templates/user_parameters.j2
index 1e80cf2..0d6fa88 100644
--- a/states/zabbix/templates/user_parameters.j2
+++ b/states/zabbix/templates/user_parameters.j2
@@ -1,4 +1,4 @@
 {%- from "zabbix/map.jinja" import zabbix with context -%}
-{%- for userparameter in zabbix.agent.userparameters %}
+{%- for userparameter in zabbix.agent2.userparameters %}
 UserParameter={{ userparameter }}
 {%- endfor %}
\ No newline at end of file