diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reportproblem.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reportproblem.tt
index efae1019a2..ae347d7690 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reportproblem.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reportproblem.tt
@@ -51,7 +51,7 @@
                                 <ol>
                                     <li>
                                         <label for="recipient">Send problem report to: </label>
-                                        [% IF library.branchemail %]
+                                        [% IF library.inbound_email_address && library.inbound_email_address != Koha.Preference('KohaAdminEmailAddress') %]
                                             <select name="recipient" id="recipient">
                                                 <option value="library">A librarian</option>
                                                 <option value="admin">Koha administrator</option>
diff --git a/opac/opac-reportproblem.pl b/opac/opac-reportproblem.pl
index 2abce15c1f..b7e133c3a7 100755
--- a/opac/opac-reportproblem.pl
+++ b/opac/opac-reportproblem.pl
@@ -52,9 +52,8 @@ my $referer = Koha::Util::Navigation::local_referer($input );
 $referer = Encode::decode_utf8 uri_unescape $referer,
 
 my $patron = Koha::Patrons->find($borrowernumber);
+my $library = $patron->library;
 my $username = $patron->userid;
-my $branchcode = $patron->branchcode;
-my $library = Koha::Libraries->find($branchcode);
 my @messages;
 
 $template->param(
@@ -81,7 +80,7 @@ if ( $op eq 'addreport' ) {
                         title          => $subject,
                         content        => $message,
                         borrowernumber => $borrowernumber,
-                        branchcode     => $branchcode,
+                        branchcode     => $patron->branchcode,
                         username       => $username,
                         problempage    => $problempage,
                         recipient      => $recipient,