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 48a7897dd1..7a02f41699 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt
@@ -267,19 +267,24 @@ $(document).ready(function() {
 		[% END %]
 		<fieldset class="rows">
             <input type="hidden" name="oldbranchcode" value="[% oldbranchcode %]" />
+            <ol>
             [% IF independant_branch %]
                 <input type="hidden" name="branchcode" value="[% independant_branch %]" />
             [% ELSE %]
-		<ol>
-			<li>
-				<label for="branch">Library:</label>
-                <select name="branchcode" id="branch" style="width:20em;">
-                    <option value="">All libraries</option>
-                [% FOREACH branchloo IN branchloop %]
-                    [% IF ( branchloo.selected ) %]<option value="[% branchloo.value %]" selected="selected">[% branchloo.branchname %]</option>[% ELSE %]<option value="[% branchloo.value %]">[% branchloo.branchname %]</option>[% END %]
+            <li>
+
+                <label for="branch">Library:</label>
+                [% IF adding %]
+                    <select name="branchcode" id="branch" style="width:20em;">
+                        <option value="">All libraries</option>
+                    [% FOREACH branchloo IN branchloop %]
+                        [% IF ( branchloo.selected ) %]<option value="[% branchloo.value %]" selected="selected">[% branchloo.branchname %]</option>[% ELSE %]<option value="[% branchloo.value %]">[% branchloo.branchname %]</option>[% END %]
+                    [% END %]
+                    </select>
+                [% ELSE %]
+                    [% Branches.GetName( branchcode ) %]
                 [% END %]
-                </select>
-			</li>
+            </li>
             [% END %]
 			<li>
 				<label for="module">Koha module:</label>
diff --git a/tools/letter.pl b/tools/letter.pl
index d090163655..3c29a09882 100755
--- a/tools/letter.pl
+++ b/tools/letter.pl
@@ -238,6 +238,7 @@ sub add_form {
         module     => $module,
         branchloop => _branchloop($branchcode),
         SQLfieldnames => $field_selection,
+        branchcode => $branchcode,
     );
     return;
 }