fix template expression to actually set the variables
Merge branch 'add_ldap_support'