diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cash_registers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cash_registers.tt
index c49a56d9aa..70628dd6dd 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cash_registers.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cash_registers.tt
@@ -115,7 +115,6 @@
                                 <input type="hidden" name="id" value="[% cash_register.id | html %]" />
                             </li>
                         [% END %]
-
                             <li>
                                 <label for="name" class="required">Name: </label>
                                 <input type="text" name="name" id="name" size="24" maxlength="24" value="[% cash_register.name | html %]" class="required focus" />
@@ -182,6 +181,8 @@
                        [% FOREACH cash_register IN cash_registers %]
                        [% IF cash_register.branch_default %]
                         [% SET tr_class="default" %]
+                       [% ELSE %]
+                        [% SET tr_class="" %]
                        [% END %]
                        <tr class="[% tr_class | html %]">
                            <td>[% cash_register.name | html %]</td>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt
index 2b21dd6d30..b5059bcb77 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt
@@ -156,9 +156,7 @@
                         <fieldset class="rows" id="match_points">
                             <h4>Match points</h4>
                             [% IF ( edit_matching_rule ) %]
-                                [% IF ( matchpoints ) %]
-                                    [% SET p_style = 'display:none;' %]
-                                [% END %]
+                                [% SET p_style = matchpoints ? 'display:none;' : 'display:block;' %]
                                 <p id="addMatchPoint" style="[% p_style | html %]">
                                     <a href="#" class="btn btn-link" onclick="InsertMatchpoint('mp_1', 'mp_template'); return false;"><i class="fa fa-plus" aria-hidden="true"></i>  New match point</a>
                                 </p>
@@ -270,9 +268,7 @@
                         <fieldset class="rows" id="match_checks">
                             <h4>Required match checks</h4>
                             [% IF ( edit_matching_rule ) %]
-                                [% IF ( matchchecks ) %]
-                                    [% SET p_style = 'display:none;' %]
-                                [% END %]
+                                [% SET p_style = matchpoints ? 'display:none;' : 'display:block;' %]
                                 <p id="addMatchCheck" style="[% p_style | html %]">
                                 <a href="#" class="btn btn-link" onclick="InsertMatchcheck('mc_1', 'mc_template'); return false;"><i class="fa fa-plus" aria-hidden="true"></i> New match check</a></p>
                             [% ELSE %]