diff --git a/circ/circulation.pl b/circ/circulation.pl
index e7732bfdc7..034a6a6969 100755
--- a/circ/circulation.pl
+++ b/circ/circulation.pl
@@ -627,6 +627,8 @@ if ($patron) {
         $template->param( is_anonymous => 1 );
         $noissues = 1;
     }
+    my $lines                = Koha::Account::Lines->search( { borrowernumber => $patron->id } );
+    my $credits_balance      = $lines->credits_total;
     my $patron_charge_limits = $patron->is_patron_inside_charge_limits();
     if ( $patron_charge_limits->{noissuescharge}->{charge} > 0 ) {
         my $noissuescharge =
@@ -637,10 +639,11 @@ if ($patron) {
             charges       => 1,
             chargesamount => $patron_charge_limits->{noissuescharge}->{charge},
         );
-    } elsif ( $balance < 0 ) {
+    }
+    if ( $credits_balance < 0 ) {
         $template->param(
             credits       => 1,
-            creditsamount => -$balance,
+            creditsamount => -$credits_balance,
         );
     }
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron_messages.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron_messages.inc
index f44fd86929..b5136f02b3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron_messages.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron_messages.inc
@@ -171,7 +171,7 @@
         [% END %]
 
         [% IF ( credits ) %]
-            <li class="credits"> <span class="circ-hlt">Credits:</span> Patron has a credit[% IF ( creditsamount ) %]of <span class="credit"><strong>[% creditsamount | $Price %]</strong></span>[% END %] </li>
+            <li class="credits"> <span class="circ-hlt">Credits:</span> Patron has outstanding credits[% IF ( creditsamount ) %]of <span class="credit"><strong>[% creditsamount | $Price %]</strong></span>[% END %] </li>
         [% END %]
         [% IF (noissues && CAN_user_circulate_force_checkout && !moremember) %]
             <li>
diff --git a/members/moremember.pl b/members/moremember.pl
index d08cef77a0..08c2f1a582 100755
--- a/members/moremember.pl
+++ b/members/moremember.pl
@@ -238,16 +238,20 @@ my $issues = $patron->checkouts;
 my $balance = 0;
 $balance = $patron->account->balance;
 
+my $lines           = Koha::Account::Lines->search( { borrowernumber => $patron->id } );
+my $credits_balance = $lines->credits_total;
+
 my $patron_charge_limits = $patron->is_patron_inside_charge_limits();
 if ( $patron_charge_limits->{noissuescharge}->{charge} > 0 ) {
     $template->param(
         charges       => 1,
         chargesamount => $patron_charge_limits->{noissuescharge}->{charge},
     );
-} elsif ( $balance < 0 ) {
+}
+if ( $credits_balance < 0 ) {
     $template->param(
         credits       => 1,
-        creditsamount => -$balance,
+        creditsamount => -$credits_balance,
     );
 }