diff --git a/acqui/basket.pl b/acqui/basket.pl
index bcddc38522..aff8b22112 100755
--- a/acqui/basket.pl
+++ b/acqui/basket.pl
@@ -659,9 +659,7 @@ sub get_order_infos {
     }
 
     my $suggestion = Koha::Suggestions->search( { biblionumber => $line{biblionumber} } )->single;
-    $line{suggestionid}         = $suggestion->suggestionid;
-    $line{surnamesuggestedby}   = $suggestion->suggester->surname;
-    $line{firstnamesuggestedby} = $suggestion->suggester->firstname;
+    $line{suggestion} = $suggestion;
 
     $line{estimated_delivery_date} = $order->{estimated_delivery_date};
 
diff --git a/acqui/parcel.pl b/acqui/parcel.pl
index 3ed8972806..067eebd702 100755
--- a/acqui/parcel.pl
+++ b/acqui/parcel.pl
@@ -151,9 +151,7 @@ for my $order (@orders) {
     $total_tax_included                 += get_rounded_price( $line{unitprice_tax_included} ) * $line{quantity};
 
     my $suggestion = Koha::Suggestions->search( { biblionumber => $line{biblionumber} } )->single;
-    $line{suggestionid}         = $suggestion->suggestionid;
-    $line{surnamesuggestedby}   = $suggestion->suggester->surname;
-    $line{firstnamesuggestedby} = $suggestion->suggester->firstname;
+    $line{suggestion} = $suggestion;
 
     if ( $line{parent_ordernumber} != $line{ordernumber} ) {
         if ( grep { $_->{ordernumber} == $line{parent_ordernumber} } @orders ) {
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
index 163fa5f323..9e80209ae7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
@@ -834,12 +834,10 @@
                                                         [% books_loo.copyrightdate | html %]
                                                     [% END -%]
                                                     [%- IF ( books_loo.editionstatement ) %], [% books_loo.editionstatement | html %][% END -%]
-                                                    [%- IF ( books_loo.suggestionid ) %]
+                                                    [%- IF ( books_loo.suggestion ) %]
                                                         <br />
-                                                        Suggested by: [% books_loo.surnamesuggestedby | html %][% IF ( books_loo.firstnamesuggestedby ) %], [% books_loo.firstnamesuggestedby | html %][% END %] (<a
-                                                            href="/cgi-bin/koha/suggestion/suggestion.pl?suggestionid=[% books_loo.suggestionid | uri %]&amp;op=show"
-                                                            >suggestion #[% books_loo.suggestionid | html %]</a
-                                                        >)
+                                                        Suggested by: [% books_loo.suggestion.suggester.surname | html %][% IF ( books_loo.suggestion.suggester.firstname ) %], [% books_loo.suggestion.suggester.firstname | html %][% END %]
+                                                        (<a href="/cgi-bin/koha/suggestion/suggestion.pl?suggestionid=[% books_loo.suggestion.suggestionid | uri %]&amp;op=show">suggestion #[% books_loo.suggestion.suggestionid | html %]</a>)
                                                     [% END %]
                                                 </p>
                                                 [% IF ( books_loo.order_internalnote ) %]
@@ -962,7 +960,7 @@
                                                         <a href="#" class="transfer_order" data-ordernumber="[% books_loo.ordernumber | html %]">Transfer</a>
                                                         <br />
                                                     [% END %]
-                                                    [% UNLESS ( books_loo.suggestionid ) %]
+                                                    [% UNLESS ( books_loo.suggestion.suggestionid ) %]
                                                         <a
                                                             data-action="/cgi-bin/koha/acqui/newordersuggestion.pl"
                                                             data-booksellerid="[% booksellerid | html %]"
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt
index 2ad08db283..508742899a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt
@@ -238,9 +238,9 @@
                                                 [% order.copyrightdate | html %]
                                             [% END %]
                                         [% END %]
-                                        [% IF ( order.suggestionid ) %]
+                                        [% IF ( order.suggestion ) %]
                                             <br />
-                                            Suggested by: [% order.surnamesuggestedby | html %][% IF ( order.firstnamesuggestedby ) %], [% order.firstnamesuggestedby | html %][% END %] (<a
+                                            Suggested by: [% order.suggestion.suggester.surname | html %][% IF ( order.suggestion.suggester.firstname ) %], [% order.suggestion.suggester.firstname | html %][% END %] (<a
                                                 href="/cgi-bin/koha/suggestion/suggestion.pl?suggestionid=[% order.suggestionid | uri %]&amp;op=show"
                                                 >suggestion #[% order.suggestionid | html %]</a
                                             >)