diff --git a/C4/Letters.pm b/C4/Letters.pm
index 827b5d1087..497b97dab9 100644
--- a/C4/Letters.pm
+++ b/C4/Letters.pm
@@ -625,6 +625,9 @@ sub GetPreparedLetter {
       or carp( "ERROR: nothing to substitute - all of 'objects', 'tables', 'loops' and 'substitute' are empty" ),
          return;
     my $want_librarian = $params{want_librarian};
+    if ($want_librarian) {
+        $objects->{librarian} = Koha::Patrons->find( C4::Context->userenv->{number} );
+    }
 
     # Best guess at language 'default' notice is written for include handling
     if ( $lang eq 'default' ) {