diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharge.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharge.tt
index 303a34237f..fd2a5b241f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharge.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharge.tt
@@ -60,6 +60,7 @@
     <div class="btn-toolbar">
         <form method="post">
             [% INCLUDE 'csrf-token.inc' %]
+            <input type="hidden" name="op" value="cud-discharge" />
             <input type="submit" name="discharge" class="btn btn-primary" value="Generate discharge" />
             <input type="hidden" value="[% patron.borrowernumber | html %]" name="borrowernumber" />
         </form>
diff --git a/members/discharge.pl b/members/discharge.pl
index e0f4b2d8cc..10002e21c5 100755
--- a/members/discharge.pl
+++ b/members/discharge.pl
@@ -49,6 +49,7 @@ my ( $template, $loggedinuser, $cookie, $flags ) = get_template_and_user({
     flagsrequired   => { 'borrowers' => 'edit_borrowers' },
 });
 
+my $op = $input->param('op') // q{};
 my $borrowernumber = $input->param('borrowernumber');
 
 unless ( C4::Context->preference('useDischarge') ) {
@@ -65,7 +66,7 @@ my $can_be_discharged = Koha::Patron::Discharge::can_be_discharged({
 });
 
 # Generating discharge if needed
-if ( $input->param('discharge') and $can_be_discharged ) {
+if ( $op eq 'cud-discharge' && $input->param('discharge') and $can_be_discharged ) {
     my $is_discharged = Koha::Patron::Discharge::is_discharged({
         borrowernumber => $borrowernumber,
     });