diff --git a/Koha/Template/Plugin/Categories.pm b/Koha/Template/Plugin/Categories.pm
index 4d425d6f9e..4b7c9c6e5d 100644
--- a/Koha/Template/Plugin/Categories.pm
+++ b/Koha/Template/Plugin/Categories.pm
@@ -45,6 +45,12 @@ sub can_any_reset_password {
         : 0;
 }
 
+sub GetPatronCharges {
+    my ( $self, $params ) = @_;
+    my $charges = Koha::Patron->is_patron_inside_charge_limits({ borrowernumber => $params });
+    return $charges->{noissuescharge};
+}
+
 1;
 
 =head1 NAME
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/blocked-fines.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/blocked-fines.inc
index b53f98d2f6..3e103ff770 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/blocked-fines.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/blocked-fines.inc
@@ -1,10 +1,11 @@
 [% USE Price %]
-[% SET NoIssuesCharge = Koha.Preference('noissuescharge') %]
-[% IF fines and fines > 0 %]
+[% USE Categories %]
+[% SET NoIssuesCharge = Categories.GetPatronCharges(borrowernumber) %]
+[% IF NoIssuesCharge.charge and NoIssuesCharge.charge > 0 %]
     <li>
         <span class="circ-hlt">Charges:</span>
-        <span>Patron has outstanding charges of [% fines | $Price %].</span>
-        [% IF !Koha.Preference('AllowFineOverride') && NoIssuesCharge && fines > NoIssuesCharge %]
+        <span>Patron has outstanding charges of [% NoIssuesCharge.charge | $Price %].</span>
+        [% IF !Koha.Preference('AllowFineOverride') && NoIssuesCharge.limit && NoIssuesCharge.overlimit %]
            <span class="circ-hlt">Checkouts are BLOCKED because fine balance is OVER THE LIMIT.</span>
         [% END %]
         [% IF CAN_user_updatecharges_remaining_permissions %]
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 666d07ad0f..38a0fb7c5c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron_messages.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron_messages.inc
@@ -119,7 +119,7 @@
         [% END %]
 
         [% IF ( charges ) %]
-            [% INCLUDE 'blocked-fines.inc' fines = chargesamount %]
+            [% INCLUDE 'blocked-fines.inc' borrowernumber = patron.borrowernumber %]
         [% END %]
 
         [% IF ( charges_guarantors_guarantees ) %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt
index 83f91ae8bd..3beb6d14af 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt
@@ -63,7 +63,7 @@
   <div class="dialog alert">
       Cannot check out!
       [% IF ( charges ) %]
-          [% INCLUDE 'blocked-fines.inc' fines = chargesamount %]
+          [% INCLUDE 'blocked-fines.inc' borrowernumber = patron.borrowernumber %]
       [% END %]
       [% IF ( charges_guarantors_guarantees ) %]
           <li>