diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt
index 27f1d9a211..17fe7e62eb 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt
@@ -91,7 +91,7 @@
               [% FOREACH lette IN letter %]
                 [% can_edit = lette.branchcode || !independant_branch %]
                 <tr>
-                  <td>[% IF lette.branchname %][% lette.branchname %][% ELSE %](All libraries)[% END %]</td>
+                  <td>X[%lette.branchcode%]X[% IF lette.branchname%][% lette.branchname | html %][% ELSE %](All libraries)[% END %]</td>
                   <td>
                       [% SWITCH lette.module %]
                           [% CASE 'acquisition' %]<span>Acquisition</span>
diff --git a/tools/letter.pl b/tools/letter.pl
index caaeb0e212..0cc0029394 100755
--- a/tools/letter.pl
+++ b/tools/letter.pl
@@ -377,6 +377,8 @@ sub retrieve_letters {
     }
 
     $sql .= " WHERE ".join(" AND ", @where) if @where;
+    $sql .= " GROUP BY branchcode,module,code,name,branchname";
+
     $sql .= " ORDER BY module, code, branchcode";
 
     return $dbh->selectall_arrayref($sql, { Slice => {} }, @args);