diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt
index d33c7b7b88..1d9e9b45de 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt
@@ -29,6 +29,7 @@
                         <div class="alert alert-success"><h4>Settings updated</h4></div>
                     [% END %]
                     <form action="/cgi-bin/koha/opac-messaging.pl" method="get" name="opacmessaging">
+                        <input type="hidden" name="csrf_token" value="[% csrf_token | html %]" />
                         <input type="hidden" name="modify" value="yes" />
 
                             <table class="table table-bordered table-condensed table-striped">
diff --git a/opac/opac-messaging.pl b/opac/opac-messaging.pl
index 496c2addec..210f9446c0 100755
--- a/opac/opac-messaging.pl
+++ b/opac/opac-messaging.pl
@@ -31,6 +31,7 @@ use C4::Members::Messaging;
 use C4::Form::MessagingPreferences;
 use Koha::Patrons;
 use Koha::SMS::Providers;
+use Koha::Token;
 
 my $query = CGI->new();
 
@@ -55,6 +56,11 @@ my $patron = Koha::Patrons->find( $borrowernumber ); # FIXME and if borrowernumb
 my $messaging_options = C4::Members::Messaging::GetMessagingOptions();
 
 if ( defined $query->param('modify') && $query->param('modify') eq 'yes' ) {
+    die "Wrong CSRF token" unless Koha::Token->new->check_csrf({
+        session_id => scalar $query->cookie('CGISESSID'),
+        token  => scalar $query->param('csrf_token'),
+    });
+
     my $sms = $query->param('SMSnumber');
     my $sms_provider_id = $query->param('sms_provider_id');
     $patron->set({
@@ -78,4 +84,11 @@ if ( C4::Context->preference("SMSSendDriver") eq 'Email' ) {
     $template->param( sms_providers => \@providers, sms_provider_id => $patron->sms_provider_id );
 }
 
+my $new_session_id = $cookie->value;
+$template->param(
+    csrf_token => Koha::Token->new->generate_csrf({
+            session_id => $new_session_id,
+        }),
+);
+
 output_html_with_http_headers $query, $cookie, $template->output, undef, { force_no_caching => 1 };