diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt
index b4ac896084..1d7f0d9f36 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt
@@ -9,7 +9,7 @@
 </head>
 [% INCLUDE 'bodytag.inc' bodyid='advsearch' bodyclass='scrollto' %]
 [% INCLUDE 'masthead.inc' %]
-<form action="/cgi-bin/koha/opac-search.pl" method="get">
+<form id="advsearch_form" action="/cgi-bin/koha/opac-search.pl" method="get">
     <input type="hidden" name="advsearch" value="1"/>
     <div class="main">
         <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumbs">
@@ -500,7 +500,7 @@ $(document).ready(function() {
         jQuery.removeCookie("form_serialized_limits", { path: '/'});
         jQuery.removeCookie("search_path_code", { path: '/'});
     [% END %]
-    $('#advsearch form').submit(function() {
+    $('#advsearch_form').submit(function() {
         $('[name^="limit"]').each(function(){
             if( $(this).val() == '' ){
                 $(this).prop("disabled","disabled");
diff --git a/opac/opac-patron-image.pl b/opac/opac-patron-image.pl
index df1efdf4ef..dccba229eb 100755
--- a/opac/opac-patron-image.pl
+++ b/opac/opac-patron-image.pl
@@ -32,13 +32,14 @@ unless (C4::Context->preference('OPACpatronimages')) {
     exit;
 }
 
-my $needed_flags;
-my %cookies = CGI::Cookie->fetch;
-my $sessid = $cookies{'CGISESSID'}->value;
-my ($auth_status) = check_cookie_auth($sessid, $needed_flags);
-my $borrowernumber = C4::Context->userenv->{'number'};
+my ($auth_status) = check_cookie_auth( $query->cookie('CGISESSID') );
+if( $auth_status ne 'ok' ) {
+    print CGI::header( '-status' => '401' );
+    exit 0;
+}
 
-my $patron_image = Koha::Patron::Images->find($borrowernumber);
+my $userenv = C4::Context->userenv;
+my $patron_image = $userenv ? Koha::Patron::Images->find( $userenv->{number} ) : undef;
 
 if ($patron_image) {
     print $query->header(
diff --git a/plugins/plugins-enable.pl b/plugins/plugins-enable.pl
index 146fae96ad..79cd88af88 100755
--- a/plugins/plugins-enable.pl
+++ b/plugins/plugins-enable.pl
@@ -27,8 +27,11 @@ die("Koha plugins are disabled!") unless C4::Context->config("enable_plugins");
 
 my $input = CGI->new;
 
-my ( $auth_status ) =
-  check_cookie_auth( $input->cookie('CGISESSID'), { plugins => 'manage' } );
+my ( $auth_status ) = check_cookie_auth( $input->cookie('CGISESSID'), { plugins => 'manage' } );
+if( $auth_status ne 'ok' ) {
+    print CGI::header( '-status' => '401' );
+    exit 0;
+}
 
 my $class = $input->param('class');
 my $method = $input->param('method');
diff --git a/svc/checkouts b/svc/checkouts
index 30bbee53b1..096d953d1f 100755
--- a/svc/checkouts
+++ b/svc/checkouts
@@ -33,8 +33,11 @@ use Koha::ItemTypes;
 
 my $input = CGI->new;
 
-my ( $auth_status, $session ) =
-  check_cookie_auth( $input->cookie('CGISESSID'));
+my ( $auth_status, $session ) = check_cookie_auth( $input->cookie('CGISESSID'));
+if( $auth_status ne 'ok' ) {
+    print CGI::header( '-status' => '401' );
+    exit 0;
+}
 
 my $userid   = $session->param('id');
 
diff --git a/svc/return_claims b/svc/return_claims
index 5ac7d49e79..726b756f83 100755
--- a/svc/return_claims
+++ b/svc/return_claims
@@ -31,8 +31,11 @@ use Koha::Patrons;
 
 my $input = CGI->new;
 
-my ( $auth_status, $session ) =
-  check_cookie_auth( $input->cookie('CGISESSID') );
+my ( $auth_status, $session ) = check_cookie_auth( $input->cookie('CGISESSID') );
+if( $auth_status ne 'ok' ) {
+    print CGI::header( '-status' => '401' );
+    exit 0;
+}
 
 my $userid  = $session->param('id');