diff --git a/Koha/Account.pm b/Koha/Account.pm
index 248eb793d4..6d0c42f989 100644
--- a/Koha/Account.pm
+++ b/Koha/Account.pm
@@ -28,6 +28,7 @@ use C4::Letters;
 use C4::Log qw( logaction );
 use C4::Stats qw( UpdateStats );
 use C4::Overdues qw(GetFine);
+use C4::Context;
 
 use Koha::Patrons;
 use Koha::Account::Credits;
@@ -705,31 +706,18 @@ my $non_issues_charges = $self->non_issues_charges
 
 Calculates amount immediately owing by the patron - non-issue charges.
 
-Charges exempt from non-issue are:
-* Res (holds) if HoldsInNoissuesCharge syspref is set to false
-* Rent (rental) if RentalsInNoissuesCharge syspref is set to false
-* Manual invoices if ManInvInNoissuesCharge syspref is set to false
+Charges can be set as exempt from non-issue by editing the debit type in the Debit Types area of System Preferences.
 
 =cut
 
 sub non_issues_charges {
     my ($self) = @_;
 
-    #NOTE: With bug 23049 these preferences could be moved to being attached
-    #to individual debit types to give more flexability and specificity.
-    my @not_fines;
-    push @not_fines, 'RESERVE'
-      unless C4::Context->preference('HoldsInNoissuesCharge');
-    push @not_fines, ( 'RENT', 'RENT_DAILY', 'RENT_RENEW', 'RENT_DAILY_RENEW' )
-      unless C4::Context->preference('RentalsInNoissuesCharge');
-    unless ( C4::Context->preference('ManInvInNoissuesCharge') ) {
-        my @man_inv = Koha::Account::DebitTypes->search({ is_system => 0 })->get_column('code');
-        push @not_fines, @man_inv;
-    }
+    my @blocking_debit_types = Koha::Account::DebitTypes->search({ restricts_checkouts => 1 }, { columns => 'code' })->get_column('code');
 
     return $self->lines->search(
         {
-            debit_type_code => { -not_in => \@not_fines }
+            debit_type_code => { -in => \@blocking_debit_types }
         },
     )->total_outstanding;
 }
diff --git a/admin/debit_types.pl b/admin/debit_types.pl
index 0b1546d8e5..ba14a23010 100755
--- a/admin/debit_types.pl
+++ b/admin/debit_types.pl
@@ -77,6 +77,7 @@ elsif ( $op eq 'add_validate' ) {
     my $can_be_invoiced = $input->param('can_be_invoiced') || 0;
     my $can_be_sold = $input->param('can_be_sold') || 0;
     my $default_amount        = $input->param('default_amount') || undef;
+    my $restricts_checkouts = $input->param('restricts_checkouts') || 0;
     my @branches = grep { $_ ne q{} } $input->multi_param('branches');
 
     if ( not defined $debit_type ) {
@@ -86,6 +87,7 @@ elsif ( $op eq 'add_validate' ) {
     $debit_type->can_be_invoiced($can_be_invoiced);
     $debit_type->can_be_sold($can_be_sold);
     $debit_type->default_amount($default_amount);
+    $debit_type->restricts_checkouts($restricts_checkouts);
 
     try {
         $debit_type->store;
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/debit_types.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/debit_types.tt
index e2a3f9ba24..d5e3c82cc4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/debit_types.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/debit_types.tt
@@ -118,6 +118,14 @@
                                         <input type="checkbox" name="can_be_sold" id="can_be_sold" value="1" />
                                     [% END %]
                                 </li>
+                                <li>
+                                    <label for="restricts_checkouts">Included in noissuescharge? </label>
+                                    [% IF debit_type.restricts_checkouts %]
+                                        <input type="checkbox" name="restricts_checkouts" id="restricts_checkouts" checked="checked" value="1" />
+                                    [% ELSE %]
+                                        <input type="checkbox" name="restricts_checkouts" id="restricts_checkouts" value="1" />
+                                    [% END %]
+                                </li>
                                 <li>
                                     <label for="branches">Libraries limitation: </label>
                                     <select id="branches" name="branches" multiple size="10">
@@ -159,6 +167,7 @@
                                     <th>Default amount</th>
                                     <th>Available for</th>
                                     <th>Library limitations</th>
+                                    <th>No issues charge</th>
                                     <th class="noExport">Actions</th>
                                 </thead>
                                 <tbody>
@@ -197,8 +206,15 @@
                                                 <span>No limitation</span>
                                             [% END %]
                                         </td>
+                                        <td>
+                                            [% IF debit_type.restricts_checkouts %]
+                                                <span>Included</span>
+                                            [% ELSE %]
+                                                <span>Not Included</span>
+                                            [% END %]
+                                        </td>
                                         <td class="actions">
-                                            [% IF !debit_type.is_system && !debit_type.archived %]
+                                            [% IF !debit_type.archived %]
                                             <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/debit_types.pl?op=add_form&amp;code=[% debit_type.code | uri %]&type=debit"><i class="fa fa-pencil"></i> Edit</a>
                                             <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/debit_types.pl?op=archive&amp;code=[% debit_type.code | uri %]"><i class="fa fa-archive"></i> Archive</a>
                                             [% ELSIF debit_type.archived %]