diff --git a/tomcat-multiple-instances/templates/tomcat-users.xml.j2 b/tomcat-multiple-instances/templates/tomcat-users.xml.j2
index 61a52ca..40c4617 100644
--- a/tomcat-multiple-instances/templates/tomcat-users.xml.j2
+++ b/tomcat-multiple-instances/templates/tomcat-users.xml.j2
@@ -27,22 +27,23 @@
   <role rolename="manager-jmx"/>
   <role rolename="manager-status"/>
 {% if tomcat_manager_gui_user_enabled %}
-  <user username="{{ tomcat_manager_gui_user }}" password="{{ tomcat_manager_gui_pwd }}" roles="{{ tomcat_manager_gui_r }}"/>
+  <user username="{{ tomcat_m_manager_gui_user }}" password="{{ tomcat_m_manager_gui_pwd }}" roles="{{ tomcat_m_manager_gui_r }}"/>
 {% endif %}
 {% if tomcat_manager_script_user_enabled %}
-  <user username="{{ tomcat_manager_script_user }}" password="{{ tomcat_manager_script_pwd }}" roles="{{ tomcat_manager_script_r }}"/>
+  <user username="{{ tomcat_m_manager_script_user }}" password="{{ tomcat_m_manager_script_pwd }}" roles="{{ tomcat_m_manager_script_r }}"/>
 {% endif %}
 {% if tomcat_manager_jmx_user_enabled %}
-  <user username="{{ tomcat_manager_jmx_user }}" password="{{ tomcat_manager_jmx_pwd }}" roles="{{ tomcat_manager_jmx_r }}"/>
+  <user username="{{ tomcat_m_manager_jmx_user }}" password="{{ tomcat_m_manager_jmx_pwd }}" roles="{{ tomcat_m_manager_jmx_r }}"/>
 {% endif %}
 {% if tomcat_manager_status_user_enabled %}
-  <user username="{{ tomcat_manager_status_user }}" password="{{ tomcat_manager_status_pwd }}" roles="{{ tomcat_manager_status_r }}"/>
+  <user username="{{ tomcat_m_manager_status_user }}" password="{{ tomcat_m_manager_status_pwd }}" roles="{{ tomcat_m_manager_status_r }}"/>
 {% endif %}
 
 {% if tomcat_m_manager_other_roles is defined %}
 {% for t_adm in  tomcat_m_manager_other_roles %}
-  <role rolename="t_adm.role"/>
-  <user username="{{ t_adm.user }}" password="{{ t_adm.password }}" roles="{{ t_adm. user_roles }}"/>
+  <role rolename="{{ t_adm.role }}"/>
+  <user username="{{ t_adm.user }}" password="{{ t_adm.password }}" roles="{{ t_adm.user_roles }}"/>
 {% endfor %}
 {% endif %}
+{% endif %}
 </tomcat-users>