diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/club-enrollments.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/club-enrollments.tt
index cfee5d7669..8bd3e534da 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/club-enrollments.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/club-enrollments.tt
@@ -46,7 +46,7 @@
                                 <th>Name</th>
                                 <th>Card number</th>
                                 [% FOREACH club_template_enrollment_field IN club.club_template.club_template_enrollment_fields %]
-                                    <th>[% club_template_enrollment_field.name %] </th>
+                                    <th>[% club_template_enrollment_field.name | html %] </th>
                                 [% END %]
                             </tr>
                         </thead>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/patron-clubs-tab.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/patron-clubs-tab.tt
index 6b2f5f93d3..13cc843bdf 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/patron-clubs-tab.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/patron-clubs-tab.tt
@@ -21,7 +21,7 @@
                     <td>[% e.date_enrolled | $KohaDates %]</td>
                     [% IF CAN_user_clubs_enroll %]
                         <td>
-                            <button class="btn btn-xs btn-default" onclick="loadEnrollmentForm([% e.club.id %],[% e.id %])">
+                            <button class="btn btn-xs btn-default" onclick="loadEnrollmentForm([% e.club.id | html %],[% e.id | html %])">
                                 <i class="fa fa-edit"></i>Modify enrollment
                             </button>
                             <button class="btn btn-xs btn-default" onclick="cancelEnrollment( [% e.id | html %] )">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/patron-enroll.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/patron-enroll.tt
index 46f60e001e..01c01e95b9 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/patron-enroll.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/patron-enroll.tt
@@ -16,17 +16,21 @@
                     [% FOREACH c IN club_enrollment_fields %]
                         [% IF f.id == c.club_template_enrollment_field_id %]
                             <li>
-                                <label>[% f.name %]</label>
+                                <label>[% f.name | html %]</label>
                                 [% IF f.authorised_value_category %]
-                                    <select name="[% f.id %]">
+                                    <select name="[% f.id | html %]">
                                         [% FOREACH a IN AuthorisedValues.Get( f.authorised_value_category ) %]
-                                        <option value="[% a.authorised_value %]" [% IF a.authorised_value == c.value %]selected="selected"[% END %]>[% a.lib %]</option>
+                                            [% IF a.authorised_value == c.value %]
+                                                <option value="[% a.authorised_value | html %]" selected="selected">[% a.lib | html %]</option>
+                                            [% ELSE %]
+                                                <option value="[% a.authorised_value | html %]">[% a.lib | html %]</option>
+                                            [% END %]
                                         [% END %]
                                     </select>
                                 [% ELSE %]
-                                    <input type="text" name="[% f.id %]" value="[% c.value %]"/>
+                                    <input type="text" name="[% f.id | html %]" value="[% c.value | html %]"/>
                                 [% END %]
-                                <span class="hint">[% f.description %]</span>
+                                <span class="hint">[% f.description | html %]</span>
                             </li>
                         [% END %]
                     [% END %]
@@ -58,8 +62,8 @@
 </div>
 
 <script>
-if([% enrollent_id %]){
-    $("#heading").html(_("Modifying enrollment")+" <em>[% club.name %]</em>");
+if([% enrollent_id | html %]){
+    $("#heading").html(_("Modifying enrollment")+" <em>[% club.name | html %]</em>");
 }
 function addEnrollment() {
     $("body").css("cursor", "progress");