diff --git a/C4/Letters.pm b/C4/Letters.pm
index 0b6a9bec1b..3eb8ace936 100644
--- a/C4/Letters.pm
+++ b/C4/Letters.pm
@@ -148,9 +148,12 @@ my %letter;
 sub getletter {
     my ( $module, $code, $branchcode ) = @_;
 
+    $branchcode |= '';
+
     if ( C4::Context->preference('IndependantBranches')
             and $branchcode
             and C4::Context->userenv ) {
+
         $branchcode = C4::Context->userenv->{'branch'};
     }
 
diff --git a/misc/cronjobs/thirdparty/TalkingTech_itiva_outbound.pl b/misc/cronjobs/thirdparty/TalkingTech_itiva_outbound.pl
index 226f17e101..b4d4e9c989 100755
--- a/misc/cronjobs/thirdparty/TalkingTech_itiva_outbound.pl
+++ b/misc/cronjobs/thirdparty/TalkingTech_itiva_outbound.pl
@@ -127,20 +127,17 @@ foreach my $type (@types) {
         my $date = C4::Dates->new( $issues->{'date_due'}, 'iso' );
         my $due_date = $date->output('metric');
 
-        # gets the placeholder message, and enqueues the letter
-        my $letter = getletter( $module, $code );
-        die "No letter found for type $type!... dying\n" unless $letter;
+        my $letter = C4::Letters::GetPreparedLetter(
+            module      => $module,
+            letter_code => $code,
+            tables      => {
+                borrowers   => $issues->{'borrowernumber'},
+                biblio      => $issues->{'biblionumber'},
+                biblioitems => $issues->{'biblionumber'}
+            },
+        );
 
-        # covers basic variable parsing in letter
-        $letter =
-          C4::Letters::parseletter( $letter, 'borrowers',
-            $issues->{'borrowernumber'} );
-        $letter =
-          C4::Letters::parseletter( $letter, 'biblio',
-            $issues->{'biblionumber'} );
-        $letter =
-          C4::Letters::parseletter( $letter, 'biblioitems',
-            $issues->{'biblionumber'} );
+        die "No letter found for type $type!... dying\n" unless $letter;
 
         my $message_id = 0;
         if ($outfile) {