diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/desks.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/desks.tt
index 67a69f1e47..69bd494237 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/desks.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/desks.tt
@@ -117,17 +117,10 @@
                     <label for="branchcode" class="required">Library: </label>
                     <select id="branchcode" name="branchcode" required="required">
                       <option value=""></option>
-                      [% FOREACH branch IN branches %]
                         [% IF desk %]
-                            [% IF (desk.branchcode == branch.branchcode) %]
-                                <option value="[% branch.branchcode|html %]" selected="selected">[% branch.branchname|html %]</option>
-                            [% END%]
+                            [% PROCESS options_for_libraries libraries => Branches.all( selected => desk.branchcode ) %]
                         [% ELSE %]
-                            [% IF (Branches.GetLoggedInBranchcode == branch.branchcode) %]
-                                <option value="[% branch.branchcode|html %]" selected="selected">[% branch.branchname|html %]</option>
-                            [% END%]
-                                <option value="[% branch.branchcode|html %]">[% branch.branchname|html %]</option>
-                        [% END %]
+                            [% PROCESS options_for_libraries libraries => Branches.all() %]
                       [% END %]
                      </select>
                 </li>