diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/pay.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/pos/pay.tt
index d4b761c9f8..cb30d5456f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/pay.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/pos/pay.tt
@@ -186,7 +186,8 @@
 
 <!-- Email receipt modal -->
 <div class="modal" id="emailReceiptModal" tabindex="-1" role="dialog" aria-labelledby="emailReceiptLabel">
-    <form id="email_form" action="/cgi-bin/koha/pos/pay.pl" method="get" enctype="multipart/form-data" class="validated">
+    <form id="email_form" action="/cgi-bin/koha/pos/pay.pl" method="post" enctype="multipart/form-data" class="validated">
+        [% INCLUDE 'csrf-token.inc' %]
         <input type="hidden" name="payment_id" value="[% payment_id | uri %]">
         <input type="hidden" name="collected" value="[% collected | uri %]">
         <input type="hidden" name="change" value="[% change | uri %]">"
@@ -208,7 +209,7 @@
                     </fieldset> <!-- /.rows -->
                 </div> <!-- /.modal-body -->
                 <div class="modal-footer">
-                    <input type="hidden" name="action" value="send">
+                    <input type="hidden" name="op" value="cud-send">
                     <button type="submit" class="btn btn-default">Confirm</button>
                     <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
                 </div> <!-- /.modal-footer -->
diff --git a/pos/pay.pl b/pos/pay.pl
index 202cea6197..3c6f2a2d5e 100755
--- a/pos/pay.pl
+++ b/pos/pay.pl
@@ -50,7 +50,7 @@ my $logged_in_user = Koha::Patrons->find($loggedinuser) or die "Not logged in";
 
 my $library_id = C4::Context->userenv->{'branch'};
 my $registerid = $input->param('registerid');
-my $action     = $input->param('action') || '';
+my $op     = $input->param('op') || '';
 
 my $invoice_types =
   Koha::Account::DebitTypes->search_with_library_limits(
@@ -84,7 +84,7 @@ if ( $total_paid and $total_paid ne '0.00' ) {
     );
 }
 
-if ( $action eq 'cud-send' ) {
+if ( $op eq 'cud-send' ) {
     my $payment_id = $input->param('payment_id');
     my $change     = $input->param('change');
     my $collected  = $input->param('collected');
@@ -95,7 +95,7 @@ if ( $action eq 'cud-send' ) {
         module                 => 'pos',
         letter_code            => 'RECEIPT',
         branchcode             => C4::Context->userenv->{'branch'},
-        message_transport_type => 'cud-email',
+        message_transport_type => 'email',
         tables                 => {
             credits => $payment_id,
         },
@@ -109,7 +109,7 @@ if ( $action eq 'cud-send' ) {
     my $message_id = EnqueueLetter(
         {
             letter                 => $letter,
-            message_transport_type => 'cud-email',
+            message_transport_type => 'email',
             from_address => C4::Context->preference('KohaAdminEmailAddress'),
             to_address   => $toaddr,
         }