user_template_xml was returning the whole template instead of the user template
Merge branch 'mguezuraga-fix_user_template_xml'