diff --git a/C4/Auth.pm b/C4/Auth.pm
index d431d5a59d..e622f20586 100644
--- a/C4/Auth.pm
+++ b/C4/Auth.pm
@@ -169,7 +169,9 @@ sub get_template_and_user {
             $in->{'query'},
             $in->{'authnotrequired'},
             $in->{'flagsrequired'},
-            $in->{'type'}
+            $in->{'type'},
+            undef,
+            $in->{template_name},
         );
     }
 
@@ -228,6 +230,7 @@ sub get_template_and_user {
                 -value    => '',
                 -expires  => '',
                 -HttpOnly => 1,
+                -secure => ( C4::Context->https_enabled() ? 1 : 0 ),
             );
 
             $template->param(
@@ -447,11 +450,6 @@ sub get_template_and_user {
 
     # these template parameters are set the same regardless of $in->{'type'}
 
-    # Set the using_https variable for templates
-    # FIXME Under Plack the CGI->https method always returns 'OFF'
-    my $https = $in->{query}->https();
-    my $using_https = ( defined $https and $https ne 'OFF' ) ? 1 : 0;
-
     my $minPasswordLength = C4::Context->preference('minPasswordLength');
     $minPasswordLength = 3 if not $minPasswordLength or $minPasswordLength < 3;
     $template->param(
@@ -471,7 +469,6 @@ sub get_template_and_user {
         singleBranchMode   => ( Koha::Libraries->search->count == 1 ),
         XSLTDetailsDisplay => C4::Context->preference("XSLTDetailsDisplay"),
         XSLTResultsDisplay => C4::Context->preference("XSLTResultsDisplay"),
-        using_https        => $using_https,
         noItemTypeImages   => C4::Context->preference("noItemTypeImages"),
         marcflavour        => C4::Context->preference("marcflavour"),
         OPACBaseURL        => C4::Context->preference('OPACBaseURL'),
@@ -791,8 +788,21 @@ sub checkauth {
     my $flagsrequired   = shift;
     my $type            = shift;
     my $emailaddress    = shift;
+    my $template_name   = shift;
     $type = 'opac' unless $type;
 
+    unless ( C4::Context->preference("OpacPublic") ) {
+        my @allowed_scripts_for_private_opac = qw(
+          opac-memberentry.tt
+          opac-registration-email-sent.tt
+          opac-registration-confirmation.tt
+          opac-memberentry-update-submitted.tt
+          opac-password-recovery.tt
+        );
+        $authnotrequired = 0 unless grep { $_ eq $template_name }
+          @allowed_scripts_for_private_opac;
+    }
+
     my $dbh     = C4::Context->dbh;
     my $timeout = _timeout_syspref();
 
@@ -830,6 +840,7 @@ sub checkauth {
             -value    => '',
             -expires  => '',
             -HttpOnly => 1,
+            -secure => ( C4::Context->https_enabled() ? 1 : 0 ),
         );
         $loggedin = 1;
     }
@@ -930,7 +941,8 @@ sub checkauth {
             $cookie = $query->cookie(
                 -name     => 'CGISESSID',
                 -value    => $session->id,
-                -HttpOnly => 1
+                -HttpOnly => 1,
+                -secure => ( C4::Context->https_enabled() ? 1 : 0 ),
             );
             $session->param( 'lasttime', time() );
             unless ( $sessiontype && $sessiontype eq 'anon' ) {    #if this is an anonymous session, we want to update the session, but not behave as if they are logged in...
@@ -959,7 +971,8 @@ sub checkauth {
         $cookie = $query->cookie(
             -name     => 'CGISESSID',
             -value    => $session->id,
-            -HttpOnly => 1
+            -HttpOnly => 1,
+            -secure => ( C4::Context->https_enabled() ? 1 : 0 ),
         );
         my $pki_field = C4::Context->preference('AllowPKIAuth');
         if ( !defined($pki_field) ) {
@@ -1127,7 +1140,8 @@ sub checkauth {
                             $cookie = $query->cookie(
                                 -name     => 'CGISESSID',
                                 -value    => '',
-                                -HttpOnly => 1
+                                -HttpOnly => 1,
+                                -secure => ( C4::Context->https_enabled() ? 1 : 0 ),
                             );
                             $info{'wrongip'} = 1;
                         }
@@ -1207,7 +1221,8 @@ sub checkauth {
             $cookie = $query->cookie(
                 -name     => 'CGISESSID',
                 -value    => '',
-                -HttpOnly => 1
+                -HttpOnly => 1,
+                -secure => ( C4::Context->https_enabled() ? 1 : 0 ),
             );
         }
 
@@ -1248,8 +1263,8 @@ sub checkauth {
     $LibraryNameTitle =~ s/<(?:\/?)(?:br|p)\s*(?:\/?)>/ /sgi;
     $LibraryNameTitle =~ s/<(?:[^<>'"]|'(?:[^']*)'|"(?:[^"]*)")*>//sg;
 
-    my $template_name = ( $type eq 'opac' ) ? 'opac-auth.tt' : 'auth.tt';
-    my $template = C4::Templates::gettemplate( $template_name, $type, $query );
+    my $auth_template_name = ( $type eq 'opac' ) ? 'opac-auth.tt' : 'auth.tt';
+    my $template = C4::Templates::gettemplate( $auth_template_name, $type, $query );
     $template->param(
         login                                 => 1,
         INPUTS                                => \@inputs,
@@ -1475,6 +1490,7 @@ sub check_api_auth {
                     -name     => 'CGISESSID',
                     -value    => $session->id,
                     -HttpOnly => 1,
+                    -secure => ( C4::Context->https_enabled() ? 1 : 0 ),
                 );
                 $session->param( 'lasttime', time() );
                 my $flags = haspermission( $userid, $flagsrequired );
@@ -1529,6 +1545,7 @@ sub check_api_auth {
                 -name     => 'CGISESSID',
                 -value    => $sessionID,
                 -HttpOnly => 1,
+                -secure => ( C4::Context->https_enabled() ? 1 : 0 ),
             );
             if ( $return == 1 ) {
                 my (
diff --git a/C4/Context.pm b/C4/Context.pm
index ea281ee800..cfd0b553fe 100644
--- a/C4/Context.pm
+++ b/C4/Context.pm
@@ -1119,6 +1119,32 @@ sub set_remote_address {
     }
 }
 
+=head3 https_enabled
+
+https_enabled should be called when checking if a HTTPS connection
+is used.
+
+Note that this depends on a HTTPS environmental variable being defined
+by the web server. This function may not return the expected result,
+if your web server or reverse proxies are not setting the correct
+X-Forwarded-Proto headers and HTTPS environmental variable.
+
+Note too that the HTTPS value can vary from web server to web server.
+We are relying on the convention of the value being "on" or "ON" here.
+
+=cut
+
+sub https_enabled {
+    my $https_enabled = 0;
+    my $env_https = $ENV{HTTPS};
+    if ($env_https){
+        if ($env_https =~ /^ON$/i){
+            $https_enabled = 1;
+        }
+    }
+    return $https_enabled;
+}
+
 1;
 
 __END__
diff --git a/C4/InstallAuth.pm b/C4/InstallAuth.pm
index 84817ce8ad..c08460582b 100644
--- a/C4/InstallAuth.pm
+++ b/C4/InstallAuth.pm
@@ -267,6 +267,7 @@ sub checkauth {
                 -name     => 'CGISESSID',
                 -value    => $session->id,
                 -HttpOnly => 1,
+                -secure => ( C4::Context->https_enabled() ? 1 : 0 ),
             );
             $loggedin = 1;
             $userid   = $session->param('cardnumber');
@@ -307,6 +308,7 @@ sub checkauth {
                 -name     => 'CGISESSID',
                 -value    => $sessionID,
                 -HttpOnly => 1,
+                -secure => ( C4::Context->https_enabled() ? 1 : 0 ),
             );
             if ( $return == 2 ) {
 
@@ -352,7 +354,8 @@ sub checkauth {
                 -name    => 'CGISESSID',
                 -value   => '',
                 -HttpOnly => 1,
-                -expires => ''
+                -expires => '',
+                -secure => ( C4::Context->https_enabled() ? 1 : 0 ),
             );
         }
         if ($envcookie) {
@@ -394,7 +397,8 @@ sub checkauth {
         -name    => 'CGISESSID',
         -value   => $sessionID,
         -HttpOnly => 1,
-        -expires => ''
+        -expires => '',
+        -secure => ( C4::Context->https_enabled() ? 1 : 0 ),
     );
     print $query->header(
         -type    => 'text/html; charset=utf-8',
diff --git a/Koha/Patron.pm b/Koha/Patron.pm
index 784d39c2a8..80b1373393 100644
--- a/Koha/Patron.pm
+++ b/Koha/Patron.pm
@@ -1339,6 +1339,19 @@ sub has_permission {
     return C4::Auth::haspermission( $self->userid, $flagsrequired );
 }
 
+=head3 is_superlibrarian
+
+  my $is_superlibrarian = $patron->is_superlibrarian;
+
+Return true if the patron is a superlibrarian.
+
+=cut
+
+sub is_superlibrarian {
+    my ($self) = @_;
+    return $self->has_permission( { superlibrarian => 1 } );
+}
+
 =head3 is_adult
 
 my $is_adult = $patron->is_adult
diff --git a/Koha/REST/V1/Patrons.pm b/Koha/REST/V1/Patrons.pm
index 1345d38046..9da9db12c3 100644
--- a/Koha/REST/V1/Patrons.pm
+++ b/Koha/REST/V1/Patrons.pm
@@ -194,6 +194,38 @@ sub update {
      }
 
     return try {
+        my $body = $c->validation->param('body');
+        my $user = $c->stash('koha.user');
+
+        if (
+                $patron->is_superlibrarian
+            and !$user->is_superlibrarian
+            and (  exists $body->{email}
+                or exists $body->{secondary_email}
+                or exists $body->{altaddress_email} )
+          )
+        {
+            foreach my $email_field ( qw(email secondary_email altaddress_email) ) {
+                my $exists_email = exists $body->{$email_field};
+                next unless $exists_email;
+
+                # exists, verify if we are asked to change it
+                my $put_email      = $body->{$email_field};
+                # As of writing this patch, 'email' is the only unmapped field
+                # (i.e. it preserves its name, hence this fallback)
+                my $db_email_field = $patron->to_api_mapping->{$email_field} // 'email';
+                my $db_email       = $patron->$db_email_field;
+
+                return $c->render(
+                    status  => 403,
+                    openapi => { error => "Not enough privileges to change a superlibrarian's email" }
+                  )
+                  unless ( !defined $put_email and !defined $db_email )
+                  or (  defined $put_email
+                    and defined $db_email
+                    and $put_email eq $db_email );
+            }
+        }
 
         $patron->set_from_api($c->validation->param('body'))->store;
         $patron->discard_changes;
diff --git a/about.pl b/about.pl
index 287a1679f6..c068b531b5 100755
--- a/about.pl
+++ b/about.pl
@@ -60,7 +60,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         template_name   => "about.tt",
         query           => $query,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { catalogue => 1 },
         debug           => 1,
     }
diff --git a/acqui/acqui-home.pl b/acqui/acqui-home.pl
index 9c70773f8f..37f9ae645f 100755
--- a/acqui/acqui-home.pl
+++ b/acqui/acqui-home.pl
@@ -44,7 +44,6 @@ my ( $template, $loggedinuser, $cookie, $userflags ) = get_template_and_user(
     {   template_name   => 'acqui/acqui-home.tt',
         query           => $query,
         type            => 'intranet',
-        authnotrequired => 0,
         flagsrequired   => { acquisition => '*' },
         debug           => 1,
     }
diff --git a/acqui/add_user_search.pl b/acqui/add_user_search.pl
index d2481c6237..8301f9aff0 100755
--- a/acqui/add_user_search.pl
+++ b/acqui/add_user_search.pl
@@ -34,7 +34,6 @@ my ( $template, $loggedinuser, $cookie, $staff_flags ) = get_template_and_user(
     {   template_name   => "common/patron_search.tt",
         query           => $input,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { acquisition => 'order_manage' },
     }
 );
diff --git a/acqui/addorder.pl b/acqui/addorder.pl
index 2c269e01ed..bb1b85b9a1 100755
--- a/acqui/addorder.pl
+++ b/acqui/addorder.pl
@@ -161,7 +161,6 @@ unless($confirm_budget_exceeding) {
             template_name   => "acqui/addorder.tt",
             query           => $input,
             type            => "intranet",
-            authnotrequired => 0,
             flagsrequired   => {acquisition => 'order_manage'},
         });
 
@@ -218,7 +217,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         template_name   => "acqui/booksellers.tt",
         query           => $input,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { acquisition => 'order_manage' },
         debug           => 1,
     }
diff --git a/acqui/addorderiso2709.pl b/acqui/addorderiso2709.pl
index 224f38a0ab..5c70e618ea 100755
--- a/acqui/addorderiso2709.pl
+++ b/acqui/addorderiso2709.pl
@@ -55,7 +55,6 @@ my ($template, $loggedinuser, $cookie, $userflags) = get_template_and_user({
     template_name => "acqui/addorderiso2709.tt",
     query => $input,
     type => "intranet",
-    authnotrequired => 0,
     flagsrequired   => { acquisition => 'order_manage' },
     debug => 1,
 });
diff --git a/acqui/basket.pl b/acqui/basket.pl
index 0c8b5eac6c..117bfe7e71 100755
--- a/acqui/basket.pl
+++ b/acqui/basket.pl
@@ -85,7 +85,6 @@ our ( $template, $loggedinuser, $cookie, $userflags ) = get_template_and_user(
         template_name   => "acqui/basket.tt",
         query           => $query,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { acquisition => 'order_manage' },
         debug           => 1,
     }
diff --git a/acqui/basketgroup.pl b/acqui/basketgroup.pl
index 5a49f77114..db63b3faea 100755
--- a/acqui/basketgroup.pl
+++ b/acqui/basketgroup.pl
@@ -65,7 +65,6 @@ our ($template, $loggedinuser, $cookie)
     = get_template_and_user({template_name => "acqui/basketgroup.tt",
 			     query => $input,
 			     type => "intranet",
-			     authnotrequired => 0,
 			     flagsrequired => {acquisition => 'group_manage'},
 			     debug => 1,
                 });
diff --git a/acqui/basketheader.pl b/acqui/basketheader.pl
index 1e6fde50ad..737f94cf6f 100755
--- a/acqui/basketheader.pl
+++ b/acqui/basketheader.pl
@@ -63,7 +63,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         template_name   => "acqui/basketheader.tt",
         query           => $input,
         type            => "intranet",
-        authnotrequired => 0,
        flagsrequired   => { acquisition => 'order_manage' },
         debug           => 1,
     }
diff --git a/acqui/booksellers.pl b/acqui/booksellers.pl
index 0b69feb497..c476b9ed51 100755
--- a/acqui/booksellers.pl
+++ b/acqui/booksellers.pl
@@ -69,7 +69,6 @@ my ( $template, $loggedinuser, $cookie, $userflags ) = get_template_and_user(
     {   template_name   => 'acqui/booksellers.tt',
         query           => $query,
         type            => 'intranet',
-        authnotrequired => 0,
         flagsrequired   => { acquisition => '*' },
         debug           => 1,
     }
diff --git a/acqui/cancelorder.pl b/acqui/cancelorder.pl
index bb5086bb4d..71deb630dc 100755
--- a/acqui/cancelorder.pl
+++ b/acqui/cancelorder.pl
@@ -42,7 +42,6 @@ my ($template, $loggedinuser, $cookie, $flags) = get_template_and_user( {
     template_name   => 'acqui/cancelorder.tt',
     query           => $input,
     type            => 'intranet',
-    authnotrequired => 0,
     flagsrequired   => { 'acquisition' => 'order_manage' },
     debug           => 1,
 } );
diff --git a/acqui/check_budget_total.pl b/acqui/check_budget_total.pl
index 4981b83e07..c45360eabe 100755
--- a/acqui/check_budget_total.pl
+++ b/acqui/check_budget_total.pl
@@ -38,7 +38,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {   template_name   => "acqui/ajax.tt",
         query           => $input,
         type            => "intranet",
-        authnotrequired => 0,
         debug => 1,    } );
 
 my $budget = GetBudget($budget_id);
diff --git a/acqui/duplicate_orders.pl b/acqui/duplicate_orders.pl
index 83af04df9c..b4c4b560fe 100755
--- a/acqui/duplicate_orders.pl
+++ b/acqui/duplicate_orders.pl
@@ -39,7 +39,6 @@ my ( $template, $loggedinuser, $cookie, $userflags ) = get_template_and_user(
         template_name   => "acqui/duplicate_orders.tt",
         query           => $input,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { acquisition => 'order_manage' },
     }
 );
diff --git a/acqui/edi_ean.pl b/acqui/edi_ean.pl
index 4520aaab09..15f25e70d3 100755
--- a/acqui/edi_ean.pl
+++ b/acqui/edi_ean.pl
@@ -51,7 +51,6 @@ else {
             template_name   => 'acqui/edi_ean.tt',
             query           => $query,
             type            => 'intranet',
-            authnotrequired => 0,
             flagsrequired   => { acquisition => 'order_manage' },
             debug           => 1,
         }
diff --git a/acqui/edifactmsgs.pl b/acqui/edifactmsgs.pl
index 12e22570f7..adc1ff3bc9 100755
--- a/acqui/edifactmsgs.pl
+++ b/acqui/edifactmsgs.pl
@@ -30,7 +30,6 @@ my ( $template, $loggedinuser, $cookie, $userflags ) = get_template_and_user(
         template_name   => 'acqui/edifactmsgs.tt',
         query           => $q,
         type            => 'intranet',
-        authnotrequired => 0,
         flagsrequired   => { acquisition => 'edi_manage' },
         debug           => 1,
     }
diff --git a/acqui/edimsg.pl b/acqui/edimsg.pl
index af6771fea7..7e87491c44 100755
--- a/acqui/edimsg.pl
+++ b/acqui/edimsg.pl
@@ -30,7 +30,6 @@ my ( $template, $loggedinuser, $cookie, $userflags ) = get_template_and_user(
         template_name   => 'acqui/edimsg.tt',
         query           => $q,
         type            => 'intranet',
-        authnotrequired => 0,
         flagsrequired   => { acquisition => 'edi_manage' },
         debug           => 1,
     }
diff --git a/acqui/histsearch.pl b/acqui/histsearch.pl
index 1f097d828f..64802dddaa 100755
--- a/acqui/histsearch.pl
+++ b/acqui/histsearch.pl
@@ -68,7 +68,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         template_name   => "acqui/histsearch.tt",
         query           => $input,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { acquisition => '*' },
         debug           => 1,
     }
diff --git a/acqui/invoice-files.pl b/acqui/invoice-files.pl
index ce674e437b..8aa517ce11 100755
--- a/acqui/invoice-files.pl
+++ b/acqui/invoice-files.pl
@@ -41,7 +41,6 @@ my ( $template, $loggedinuser, $cookie, $flags ) = get_template_and_user(
         template_name   => 'acqui/invoice-files.tt',
         query           => $input,
         type            => 'intranet',
-        authnotrequired => 0,
         flagsrequired   => { 'acquisition' => '*' },
         debug           => 1,
     }
diff --git a/acqui/invoice.pl b/acqui/invoice.pl
index 26717e99fe..283ee730b3 100755
--- a/acqui/invoice.pl
+++ b/acqui/invoice.pl
@@ -46,7 +46,6 @@ my ( $template, $loggedinuser, $cookie, $flags ) = get_template_and_user(
         template_name   => 'acqui/invoice.tt',
         query           => $input,
         type            => 'intranet',
-        authnotrequired => 0,
         flagsrequired   => { 'acquisition' => '*' },
         debug           => 1,
     }
diff --git a/acqui/invoices.pl b/acqui/invoices.pl
index 8ab7a3256d..076e26733b 100755
--- a/acqui/invoices.pl
+++ b/acqui/invoices.pl
@@ -43,7 +43,6 @@ my ( $template, $loggedinuser, $cookie, $flags ) = get_template_and_user(
         template_name   => 'acqui/invoices.tt',
         query           => $input,
         type            => 'intranet',
-        authnotrequired => 0,
         flagsrequired   => { 'acquisition' => '*' },
         debug           => 1,
     }
diff --git a/acqui/lateorders-export.pl b/acqui/lateorders-export.pl
index c8d86e6be4..cfb4b8c2bf 100755
--- a/acqui/lateorders-export.pl
+++ b/acqui/lateorders-export.pl
@@ -28,7 +28,6 @@ my ($template, $loggedinuser, $cookie) = get_template_and_user({
     template_name => "acqui/csv/lateorders.tt",
     query => $input,
     type => "intranet",
-    authnotrequired => 0,
     flagsrequired => {acquisition => 'order_receive'},
 });
 my @ordernumbers = $input->multi_param('ordernumber');
diff --git a/acqui/lateorders.pl b/acqui/lateorders.pl
index e72ba350f0..d2ec6be477 100755
--- a/acqui/lateorders.pl
+++ b/acqui/lateorders.pl
@@ -60,7 +60,6 @@ my ($template, $loggedinuser, $cookie) = get_template_and_user(
         template_name   => "acqui/lateorders.tt",
         query           => $input,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { acquisition => 'order_receive' },
         debug           => 1,
     }
diff --git a/acqui/modordernotes.pl b/acqui/modordernotes.pl
index d0bd672e44..7801c7f911 100755
--- a/acqui/modordernotes.pl
+++ b/acqui/modordernotes.pl
@@ -40,7 +40,6 @@ my ($template, $loggedinuser, $cookie, $flags) = get_template_and_user( {
     template_name   => 'acqui/modordernotes.tt',
     query           => $input,
     type            => 'intranet',
-    authnotrequired => 0,
     flagsrequired   => { 'acquisition' => '*' },
     debug           => 1,
 } );
diff --git a/acqui/neworderempty.pl b/acqui/neworderempty.pl
index 6ac2e1e38b..80d43543f3 100755
--- a/acqui/neworderempty.pl
+++ b/acqui/neworderempty.pl
@@ -115,7 +115,6 @@ our ( $template, $loggedinuser, $cookie, $userflags ) = get_template_and_user(
         template_name   => "acqui/neworderempty.tt",
         query           => $input,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { acquisition => 'order_manage' },
         debug           => 1,
     }
@@ -572,7 +571,6 @@ sub Load_Duplicate {
         template_name   => "acqui/neworderempty_duplicate.tt",
         query           => $input,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { acquisition => 'order_manage' },
 #        debug           => 1,
     }
diff --git a/acqui/newordersubscription.pl b/acqui/newordersubscription.pl
index 51151af7f2..db14455c88 100755
--- a/acqui/newordersubscription.pl
+++ b/acqui/newordersubscription.pl
@@ -45,7 +45,6 @@ my ( $template, $loggedinuser, $cookie, $flags ) = get_template_and_user(
     {   template_name   => "acqui/newordersubscription.tt",
         query           => $query,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { acquisition => 'order_manage' },
     }
 );
diff --git a/acqui/ordered.pl b/acqui/ordered.pl
index 8f095302dd..a3b3436049 100755
--- a/acqui/ordered.pl
+++ b/acqui/ordered.pl
@@ -45,7 +45,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         template_name   => "acqui/ordered.tt",
         query           => $input,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { acquisition => '*' },
         debug           => 1,
     }
diff --git a/acqui/orderreceive.pl b/acqui/orderreceive.pl
index 0b9ef232b6..8e0de2043f 100755
--- a/acqui/orderreceive.pl
+++ b/acqui/orderreceive.pl
@@ -99,7 +99,6 @@ my ( $template, $loggedinuser, $cookie, $userflags ) = get_template_and_user(
         template_name   => "acqui/orderreceive.tt",
         query           => $input,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => {acquisition => 'order_receive'},
         debug           => 1,
     }
diff --git a/acqui/parcel.pl b/acqui/parcel.pl
index 9c16c9ccfe..c65d7ee29b 100755
--- a/acqui/parcel.pl
+++ b/acqui/parcel.pl
@@ -81,7 +81,6 @@ my ($template, $loggedinuser, $cookie)
     = get_template_and_user({template_name => "acqui/parcel.tt",
                  query => $input,
                  type => "intranet",
-                 authnotrequired => 0,
                  flagsrequired => {acquisition => 'order_receive'},
                  debug => 1,
 });
diff --git a/acqui/parcels.pl b/acqui/parcels.pl
index c0a330b479..a37606ed1e 100755
--- a/acqui/parcels.pl
+++ b/acqui/parcels.pl
@@ -92,7 +92,6 @@ our ( $template, $loggedinuser, $cookie, $flags ) = get_template_and_user(
     {   template_name   => 'acqui/parcels.tt',
         query           => $input,
         type            => 'intranet',
-        authnotrequired => 0,
         flagsrequired   => { acquisition => 'order_receive' },
         debug           => 1,
     }
diff --git a/acqui/showorder.pl b/acqui/showorder.pl
index 30f8c0688c..6314076b23 100755
--- a/acqui/showorder.pl
+++ b/acqui/showorder.pl
@@ -29,7 +29,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user({
     template_name   => "acqui/showorder.tt",
     query           => $cgi,
     type            => "intranet",
-    authnotrequired => 0,
     flagsrequired   => { acquisition => '*' },
 });
 
diff --git a/acqui/spent.pl b/acqui/spent.pl
index 083429a338..e69f41e9e4 100755
--- a/acqui/spent.pl
+++ b/acqui/spent.pl
@@ -47,7 +47,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         template_name   => "acqui/spent.tt",
         query           => $input,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { acquisition => '*' },
         debug           => 1,
     }
diff --git a/acqui/supplier.pl b/acqui/supplier.pl
index 40235dfacd..1d436ac3a9 100755
--- a/acqui/supplier.pl
+++ b/acqui/supplier.pl
@@ -59,7 +59,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {   template_name   => 'acqui/supplier.tt',
         query           => $query,
         type            => 'intranet',
-        authnotrequired => 0,
         flagsrequired   => { acquisition => '*' },
         debug           => 1,
     }
diff --git a/acqui/uncertainprice.pl b/acqui/uncertainprice.pl
index 5ecf41d83c..82eb864b69 100755
--- a/acqui/uncertainprice.pl
+++ b/acqui/uncertainprice.pl
@@ -61,7 +61,6 @@ my ($template, $loggedinuser, $cookie)
     = get_template_and_user({template_name => "acqui/uncertainprice.tt",
 			     query => $input,
 			     type => "intranet",
-			     authnotrequired => 0,
 			     flagsrequired   => { acquisition => 'order_manage' },
 			     debug => 1,
                 });
diff --git a/admin/add_user_search.pl b/admin/add_user_search.pl
index ba3989aa51..d31cf11355 100755
--- a/admin/add_user_search.pl
+++ b/admin/add_user_search.pl
@@ -34,7 +34,6 @@ my ( $template, $loggedinuser, $cookie, $staff_flags ) = get_template_and_user(
     {   template_name   => "common/patron_search.tt",
         query           => $input,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { acquisition => 'budget_modify'  },
     }
 );
diff --git a/admin/additional-fields.pl b/admin/additional-fields.pl
index f2516d71cf..a7b4ffe701 100755
--- a/admin/additional-fields.pl
+++ b/admin/additional-fields.pl
@@ -41,7 +41,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         template_name   => "admin/additional-fields.tt",
         query           => $input,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => \%flagsrequired,
         debug           => 1,
     }
diff --git a/admin/admin-home.pl b/admin/admin-home.pl
index f6a7b23ac1..91e8d6e57c 100755
--- a/admin/admin-home.pl
+++ b/admin/admin-home.pl
@@ -32,7 +32,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         template_name   => "admin/admin-home.tt",
         query           => $query,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { parameters => '*' },
         debug           => 1,
     }
diff --git a/admin/adveditorshortcuts.pl b/admin/adveditorshortcuts.pl
index 555ddc9ef6..abd315ec8e 100755
--- a/admin/adveditorshortcuts.pl
+++ b/admin/adveditorshortcuts.pl
@@ -50,7 +50,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {   template_name   => "admin/adveditorshortcuts.tt",
         query           => $input,
         type            => "intranet",
-        authnotrequired => 1,
         flagsrequired   => { parameters => 'manage_keyboard_shortcuts' },
         debug           => 1,
     }
diff --git a/admin/aqbudgetperiods.pl b/admin/aqbudgetperiods.pl
index aa2998d91a..39588d626c 100755
--- a/admin/aqbudgetperiods.pl
+++ b/admin/aqbudgetperiods.pl
@@ -82,7 +82,6 @@ my ($template, $borrowernumber, $cookie, $staff_flags ) = get_template_and_user(
         template_name   => "admin/aqbudgetperiods.tt",
         query           => $input,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { acquisition => 'period_manage' },
         debug           => 1,
     }
diff --git a/admin/aqbudgets.pl b/admin/aqbudgets.pl
index 684e0e2159..b9ba3b5855 100755
--- a/admin/aqbudgets.pl
+++ b/admin/aqbudgets.pl
@@ -43,7 +43,6 @@ my ($template, $borrowernumber, $cookie, $staffflags ) = get_template_and_user(
     {   template_name   => "admin/aqbudgets.tt",
         query           => $input,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { acquisition => 'budget_manage' },
         debug           => 0,
     }
diff --git a/admin/aqcontract.pl b/admin/aqcontract.pl
index e4f1d8d139..e942ae4d31 100755
--- a/admin/aqcontract.pl
+++ b/admin/aqcontract.pl
@@ -41,7 +41,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {   template_name   => "admin/aqcontract.tt",
         query           => $input,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { acquisition => 'contracts_manage' },
         debug           => 1,
     }
diff --git a/admin/aqplan.pl b/admin/aqplan.pl
index 0ba3d25fef..d602513a36 100755
--- a/admin/aqplan.pl
+++ b/admin/aqplan.pl
@@ -45,7 +45,6 @@ my ( $template, $borrowernumber, $cookie, $staff_flags ) = get_template_and_user
     {   template_name   => "admin/aqplan.tt",
         query           => $input,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { acquisition => 'planning_manage' },
         debug           => 0,
     }
diff --git a/admin/audio_alerts.pl b/admin/audio_alerts.pl
index 759eddc05b..47535abaf8 100755
--- a/admin/audio_alerts.pl
+++ b/admin/audio_alerts.pl
@@ -39,7 +39,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         template_name   => "admin/audio_alerts.tt",
         query           => $cgi,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { parameters => 'manage_audio_alerts' },
         debug           => 1,
     }
diff --git a/admin/auth_subfields_structure.pl b/admin/auth_subfields_structure.pl
index 866e5f7407..1115a9f361 100755
--- a/admin/auth_subfields_structure.pl
+++ b/admin/auth_subfields_structure.pl
@@ -61,7 +61,6 @@ my ($template, $borrowernumber, $cookie) = get_template_and_user(
     {   template_name   => "admin/auth_subfields_structure.tt",
         query           => $input,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { parameters => 'manage_marc_frameworks' },
         debug           => 1,
     }
diff --git a/admin/auth_tag_structure.pl b/admin/auth_tag_structure.pl
index b66cbff017..311b52d751 100755
--- a/admin/auth_tag_structure.pl
+++ b/admin/auth_tag_structure.pl
@@ -49,7 +49,6 @@ my ($template, $loggedinuser, $cookie)
     = get_template_and_user({template_name => "admin/auth_tag_structure.tt",
                  query => $input,
                  type => "intranet",
-                 authnotrequired => 0,
                  flagsrequired => {parameters => 'manage_marc_frameworks'},
                  debug => 1,
                  });
diff --git a/admin/authorised_values.pl b/admin/authorised_values.pl
index 34540e1e20..393f9d08bd 100755
--- a/admin/authorised_values.pl
+++ b/admin/authorised_values.pl
@@ -41,7 +41,6 @@ my @messages;
 
 our ($template, $borrowernumber, $cookie)= get_template_and_user({
     template_name => "admin/authorised_values.tt",
-    authnotrequired => 0,
     flagsrequired => {parameters => 'manage_auth_values'},
     query => $input,
     type => "intranet",
diff --git a/admin/authtypes.pl b/admin/authtypes.pl
index c864db792a..4141c68d40 100755
--- a/admin/authtypes.pl
+++ b/admin/authtypes.pl
@@ -36,7 +36,6 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
     {   template_name   => "admin/authtypes.tt",
         query           => $input,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { parameters => 'manage_marc_frameworks' },
         debug           => 1,
     }
diff --git a/admin/biblio_framework.pl b/admin/biblio_framework.pl
index 0c30e95774..f3bd4435f9 100755
--- a/admin/biblio_framework.pl
+++ b/admin/biblio_framework.pl
@@ -38,7 +38,6 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
     {   template_name   => "admin/biblio_framework.tt",
         query           => $input,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { parameters => 'manage_marc_frameworks' },
         debug           => 1,
     }
diff --git a/admin/branches.pl b/admin/branches.pl
index 68b9c25ce5..34e4757fe3 100755
--- a/admin/branches.pl
+++ b/admin/branches.pl
@@ -38,7 +38,6 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
     {   template_name   => "admin/branches.tt",
         query           => $input,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { parameters => 'manage_libraries' },
         debug           => 1,
     }
diff --git a/admin/cash_registers.pl b/admin/cash_registers.pl
index 3f10ed97bb..70ecd8a31b 100755
--- a/admin/cash_registers.pl
+++ b/admin/cash_registers.pl
@@ -36,7 +36,6 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
         template_name   => 'admin/cash_registers.tt',
         query           => $cgi,
         type            => 'intranet',
-        authnotrequired => 0,
         flagsrequired   => { admin => 'edit_cash_registers' },
     }
 );
diff --git a/admin/categories.pl b/admin/categories.pl
index f9144e7ced..6e6b92e8f6 100755
--- a/admin/categories.pl
+++ b/admin/categories.pl
@@ -42,7 +42,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         template_name   => "admin/categories.tt",
         query           => $input,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { parameters => 'manage_patron_categories' },
         debug           => 1,
     }
diff --git a/admin/check_budget_parent.pl b/admin/check_budget_parent.pl
index 0fdedfbfc9..c82e684245 100755
--- a/admin/check_budget_parent.pl
+++ b/admin/check_budget_parent.pl
@@ -40,7 +40,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {   template_name   => "acqui/ajax.tt",
         query           => $input,
         type            => "intranet",
-        authnotrequired => 0,
         debug           => 0,
     }
 );
diff --git a/admin/check_parent_total.pl b/admin/check_parent_total.pl
index 6da8d28668..72f3b5ef06 100755
--- a/admin/check_parent_total.pl
+++ b/admin/check_parent_total.pl
@@ -46,7 +46,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {   template_name   => "acqui/ajax.tt",
         query           => $input,
         type            => "intranet",
-        authnotrequired => 0,
         debug           => 0,
     }
 );
diff --git a/admin/checkmarc.pl b/admin/checkmarc.pl
index 3f5f61b6b4..174f0f90e6 100755
--- a/admin/checkmarc.pl
+++ b/admin/checkmarc.pl
@@ -32,7 +32,6 @@ my ($template, $borrowernumber, $cookie)
     = get_template_and_user({template_name => "admin/checkmarc.tt",
 			     query => $input,
 			     type => "intranet",
-			     authnotrequired => 0,
                  flagsrequired => { parameters => 'manage_marc_frameworks' },
 			     debug => 1,
 			     });
diff --git a/admin/cities.pl b/admin/cities.pl
index de86112797..cbdc9f77fb 100755
--- a/admin/cities.pl
+++ b/admin/cities.pl
@@ -36,7 +36,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {   template_name   => "admin/cities.tt",
         query           => $input,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { parameters => 'manage_cities' },
         debug           => 1,
     }
diff --git a/admin/classsources.pl b/admin/classsources.pl
index 697db41e45..a937f7bc18 100755
--- a/admin/classsources.pl
+++ b/admin/classsources.pl
@@ -49,7 +49,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         template_name   => "admin/classsources.tt",
         query           => $input,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { parameters => 'manage_classifications' },
         debug           => 1,
     }
diff --git a/admin/clone-rules.pl b/admin/clone-rules.pl
index 814351a71a..b3dabd949d 100755
--- a/admin/clone-rules.pl
+++ b/admin/clone-rules.pl
@@ -41,7 +41,6 @@ my ($template, $loggedinuser, $cookie)
     = get_template_and_user({template_name => "admin/clone-rules.tt",
                             query => $input,
                             type => "intranet",
-                            authnotrequired => 0,
                             flagsrequired => {parameters => 'manage_circ_rules'},
                             debug => 1,
                             });
diff --git a/admin/columns_settings.pl b/admin/columns_settings.pl
index 5283963184..a32f7196d0 100755
--- a/admin/columns_settings.pl
+++ b/admin/columns_settings.pl
@@ -14,7 +14,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         template_name   => "admin/columns_settings.tt",
         query           => $input,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { parameters => 'manage_column_config' },
         debug           => 1,
     }
diff --git a/admin/currency.pl b/admin/currency.pl
index 41003aeca9..d3dfab5e45 100755
--- a/admin/currency.pl
+++ b/admin/currency.pl
@@ -39,7 +39,6 @@ our ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {   template_name   => 'admin/currency.tt',
         query           => $input,
         type            => 'intranet',
-        authnotrequired => 0,
         flagsrequired   => { acquisition => 'currencies_manage' },
     }
 );
diff --git a/admin/debit_types.pl b/admin/debit_types.pl
index 89decf1160..ca48ab14f7 100755
--- a/admin/debit_types.pl
+++ b/admin/debit_types.pl
@@ -38,7 +38,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         template_name   => "admin/debit_types.tt",
         query           => $input,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { parameters => 'parameters_remaining_permissions' },
         debug           => 1,
     }
diff --git a/admin/didyoumean.pl b/admin/didyoumean.pl
index ef99c8b754..c68a1dc588 100755
--- a/admin/didyoumean.pl
+++ b/admin/didyoumean.pl
@@ -15,7 +15,6 @@ my ($template, $loggedinuser, $cookie)
     = get_template_and_user({template_name => "admin/didyoumean.tt",
             query => $input,
             type => "intranet",
-            authnotrequired => 0,
             flagsrequired => {parameters => 'manage_didyoumean'},
             debug => 1,
             });
diff --git a/admin/edi_accounts.pl b/admin/edi_accounts.pl
index a6beaf0149..83ba62d66f 100755
--- a/admin/edi_accounts.pl
+++ b/admin/edi_accounts.pl
@@ -32,7 +32,6 @@ our ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         template_name   => 'admin/edi_accounts.tt',
         query           => $input,
         type            => 'intranet',
-        authnotrequired => 0,
         flagsrequired   => { acquisition => 'edi_manage' },
     }
 );
diff --git a/admin/edi_ean_accounts.pl b/admin/edi_ean_accounts.pl
index e28457c59c..010c5a3b8a 100755
--- a/admin/edi_ean_accounts.pl
+++ b/admin/edi_ean_accounts.pl
@@ -30,7 +30,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         template_name   => 'admin/edi_ean_accounts.tt',
         query           => $input,
         type            => 'intranet',
-        authnotrequired => 0,
         flagsrequired   => { acquisition => 'edi_manage' },
     }
 );
diff --git a/admin/item_circulation_alerts.pl b/admin/item_circulation_alerts.pl
index 9ea89a5b53..940356f785 100755
--- a/admin/item_circulation_alerts.pl
+++ b/admin/item_circulation_alerts.pl
@@ -43,7 +43,6 @@ sub show {
             template_name   => "admin/item_circulation_alerts.tt",
             query           => $input,
             type            => "intranet",
-            authnotrequired => 0,
             flagsrequired   => { parameters => 'item_circ_alerts' },
             debug           => defined($input->param('debug')),
         }
diff --git a/admin/items_search_field.pl b/admin/items_search_field.pl
index a5d87ee604..4d141c5c8a 100755
--- a/admin/items_search_field.pl
+++ b/admin/items_search_field.pl
@@ -30,7 +30,6 @@ my ($template, $borrowernumber, $cookie) = get_template_and_user({
     template_name => 'admin/items_search_field.tt',
     query => $cgi,
     type => 'intranet',
-    authnotrequired => 0,
     flagsrequired   => { parameters => 'manage_item_search_fields' },
 });
 
diff --git a/admin/items_search_fields.pl b/admin/items_search_fields.pl
index 4afa7383c5..c66b51b484 100755
--- a/admin/items_search_fields.pl
+++ b/admin/items_search_fields.pl
@@ -30,7 +30,6 @@ my ($template, $borrowernumber, $cookie) = get_template_and_user({
     template_name => 'admin/items_search_fields.tt',
     query => $cgi,
     type => 'intranet',
-    authnotrequired => 0,
     flagsrequired   => { parameters => 'manage_item_search_fields' },
 });
 
diff --git a/admin/itemtypes.pl b/admin/itemtypes.pl
index 8a341b6e11..19a8491354 100755
--- a/admin/itemtypes.pl
+++ b/admin/itemtypes.pl
@@ -45,7 +45,6 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
     {   template_name   => "admin/itemtypes.tt",
         query           => $input,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { parameters => 'manage_itemtypes' },
         debug           => 1,
     }
diff --git a/admin/koha2marclinks.pl b/admin/koha2marclinks.pl
index 0f987cfdf5..d26f6e5084 100755
--- a/admin/koha2marclinks.pl
+++ b/admin/koha2marclinks.pl
@@ -36,7 +36,6 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user (
         template_name   => "admin/koha2marclinks.tt",
         query           => $input,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { parameters => 'manage_marc_frameworks' },
         debug           => 1,
     }
diff --git a/admin/library_groups.pl b/admin/library_groups.pl
index 4c5ce25b4e..e2168e508a 100755
--- a/admin/library_groups.pl
+++ b/admin/library_groups.pl
@@ -34,7 +34,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         template_name   => "admin/library_groups.tt",
         query           => $cgi,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { parameters => 'manage_libraries' },
         debug           => 1,
     }
diff --git a/admin/localization.pl b/admin/localization.pl
index f8bc553c05..e21a6346a9 100755
--- a/admin/localization.pl
+++ b/admin/localization.pl
@@ -30,7 +30,6 @@ my $query = new CGI;
 
 my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
     {   template_name   => "admin/localization.tt",
-        authnotrequired => 0,
         flagsrequired   => { parameters => 'manage_itemtypes' },
         query           => $query,
         type            => "intranet",
diff --git a/admin/marc_subfields_structure.pl b/admin/marc_subfields_structure.pl
index cdefc25884..e82476d442 100755
--- a/admin/marc_subfields_structure.pl
+++ b/admin/marc_subfields_structure.pl
@@ -74,7 +74,6 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
         template_name   => "admin/marc_subfields_structure.tt",
         query           => $input,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { parameters => 'manage_marc_frameworks' },
         debug           => 1,
     }
diff --git a/admin/marctagstructure.pl b/admin/marctagstructure.pl
index 5c7de99eac..e8a6a7bc78 100755
--- a/admin/marctagstructure.pl
+++ b/admin/marctagstructure.pl
@@ -52,7 +52,6 @@ my ($template, $loggedinuser, $cookie)
     = get_template_and_user({template_name => "admin/marctagstructure.tt",
 			     query => $input,
 			     type => "intranet",
-			     authnotrequired => 0,
                  flagsrequired => { parameters => 'manage_marc_frameworks' },
 			     debug => 1,
 			     });
diff --git a/admin/matching-rules.pl b/admin/matching-rules.pl
index a9f85c63db..f6f8770135 100755
--- a/admin/matching-rules.pl
+++ b/admin/matching-rules.pl
@@ -37,7 +37,6 @@ my ($template, $loggedinuser, $cookie)
     = get_template_and_user({template_name => "admin/matching-rules.tt",
                  query => $input,
                  type => "intranet",
-                 authnotrequired => 0,
                  flagsrequired => { parameters => 'manage_matching_rules' },
                  debug => 1,
                  });
diff --git a/admin/oai_set_mappings.pl b/admin/oai_set_mappings.pl
index af956583d1..878856ec88 100755
--- a/admin/oai_set_mappings.pl
+++ b/admin/oai_set_mappings.pl
@@ -44,7 +44,6 @@ my ($template, $loggedinuser, $cookie, $flags) = get_template_and_user( {
     template_name   => 'admin/oai_set_mappings.tt',
     query           => $input,
     type            => 'intranet',
-    authnotrequired => 0,
     flagsrequired   => { 'parameters' => 'manage_oai_sets' },
     debug           => 1,
 } );
diff --git a/admin/oai_sets.pl b/admin/oai_sets.pl
index 0c75680b36..4f2a640905 100755
--- a/admin/oai_sets.pl
+++ b/admin/oai_sets.pl
@@ -40,7 +40,6 @@ my ($template, $loggedinuser, $cookie, $flags) = get_template_and_user( {
     template_name   => 'admin/oai_sets.tt',
     query           => $input,
     type            => 'intranet',
-    authnotrequired => 0,
     flagsrequired   => { 'parameters' => 'manage_oai_sets' },
     debug           => 1,
 } );
diff --git a/admin/overdrive.pl b/admin/overdrive.pl
index c7359f263d..ef12d60ed8 100755
--- a/admin/overdrive.pl
+++ b/admin/overdrive.pl
@@ -35,7 +35,6 @@ our ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {   template_name   => 'admin/overdrive.tt',
         query           => $input,
         type            => 'intranet',
-        authnotrequired => 0,
         flagsrequired   => { parameters => 'parameters_remaining_permissions' },
     }
 );
diff --git a/admin/patron-attr-types.pl b/admin/patron-attr-types.pl
index 8658357571..f2003a9292 100755
--- a/admin/patron-attr-types.pl
+++ b/admin/patron-attr-types.pl
@@ -44,7 +44,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {   template_name   => "admin/patron-attr-types.tt",
         query           => $input,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired => { parameters => 'manage_patron_attributes' }
     }
 );
diff --git a/admin/preferences.pl b/admin/preferences.pl
index 657dc58268..ffa0b88ed4 100755
--- a/admin/preferences.pl
+++ b/admin/preferences.pl
@@ -301,7 +301,6 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
     {   template_name   => "admin/preferences.tt",
         query           => $input,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { parameters => 'manage_sysprefs' },
         debug           => 1,
     }
diff --git a/admin/searchengine/elasticsearch/mappings.pl b/admin/searchengine/elasticsearch/mappings.pl
index ff2a2790a6..3e7235b467 100755
--- a/admin/searchengine/elasticsearch/mappings.pl
+++ b/admin/searchengine/elasticsearch/mappings.pl
@@ -38,7 +38,6 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
         template_name   => 'admin/searchengine/elasticsearch/mappings.tt',
         query           => $input,
         type            => 'intranet',
-        authnotrequired => 0,
         flagsrequired   => { parameters => 'manage_search_engine_config' },
     }
 );
diff --git a/admin/share_content.pl b/admin/share_content.pl
index 3c76aba96d..dbd2c50471 100755
--- a/admin/share_content.pl
+++ b/admin/share_content.pl
@@ -32,7 +32,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         template_name   => "admin/share_content.tt",
         query           => $query,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { parameters => 'manage_mana' },
         debug           => 1,
     }
diff --git a/admin/smart-rules.pl b/admin/smart-rules.pl
index 30d8fca24b..734eb77541 100755
--- a/admin/smart-rules.pl
+++ b/admin/smart-rules.pl
@@ -45,7 +45,6 @@ my ($template, $loggedinuser, $cookie)
     = get_template_and_user({template_name => "admin/smart-rules.tt",
                             query => $input,
                             type => "intranet",
-                            authnotrequired => 0,
                             flagsrequired => {parameters => 'manage_circ_rules'},
                             debug => 1,
                             });
diff --git a/admin/sms_providers.pl b/admin/sms_providers.pl
index c52a68eacd..f3c42f805d 100755
--- a/admin/sms_providers.pl
+++ b/admin/sms_providers.pl
@@ -35,7 +35,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         template_name   => "admin/sms_providers.tt",
         query           => $cgi,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { parameters => 'manage_sms_providers' },
         debug           => 1,
     }
diff --git a/admin/sru_modmapping.pl b/admin/sru_modmapping.pl
index 80d284c668..d798eea19d 100755
--- a/admin/sru_modmapping.pl
+++ b/admin/sru_modmapping.pl
@@ -31,7 +31,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user( {
     template_name => $type eq "authority" ? "admin/sru_modmapping_auth.tt" : "admin/sru_modmapping.tt",
     query => $input,
     type => "intranet",
-    authnotrequired => 0,
     flagsrequired   => { parameters => 'manage_search_targets' },
 });
 
diff --git a/admin/systempreferences.pl b/admin/systempreferences.pl
index 32a5c93782..10264fbf02 100755
--- a/admin/systempreferences.pl
+++ b/admin/systempreferences.pl
@@ -215,7 +215,6 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
     {   template_name   => "admin/systempreferences.tt",
         query           => $input,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { parameters => 'manage_sysprefs' },
         debug           => 1,
     }
diff --git a/admin/transport-cost-matrix.pl b/admin/transport-cost-matrix.pl
index beea9d2877..9ef26c72b1 100755
--- a/admin/transport-cost-matrix.pl
+++ b/admin/transport-cost-matrix.pl
@@ -36,7 +36,6 @@ my ($template, $loggedinuser, $cookie)
     = get_template_and_user({template_name => "admin/transport-cost-matrix.tt",
                             query => $input,
                             type => "intranet",
-                            authnotrequired => 0,
                             flagsrequired => { parameters => 'manage_transfers' },
                             debug => 1,
                             });
diff --git a/admin/usage_statistics.pl b/admin/usage_statistics.pl
index 58df2655b8..8e35d6c56a 100755
--- a/admin/usage_statistics.pl
+++ b/admin/usage_statistics.pl
@@ -29,7 +29,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         template_name   => "admin/usage_statistics.tt",
         query           => $query,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { parameters => 'manage_usage_stats' },
         debug           => 1,
     }
diff --git a/admin/z3950servers.pl b/admin/z3950servers.pl
index cb226663d8..2e07f580fc 100755
--- a/admin/z3950servers.pl
+++ b/admin/z3950servers.pl
@@ -44,7 +44,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user( {
     template_name => "admin/z3950servers.tt",
     query => $input,
     type => "intranet",
-    authnotrequired => 0,
     flagsrequired => { parameters => 'manage_search_targets' },
     debug => 1,
 });
diff --git a/authorities/auth_finder.pl b/authorities/auth_finder.pl
index 208f076a13..98d413bc58 100755
--- a/authorities/auth_finder.pl
+++ b/authorities/auth_finder.pl
@@ -46,7 +46,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         : 'authorities/auth_finder.tt',
         query           => $query,
         type            => 'intranet',
-        authnotrequired => 0,
         flagsrequired   => { catalogue => 1 },
     }
 );
diff --git a/authorities/authorities-home.pl b/authorities/authorities-home.pl
index 76748aa66a..828ba24b7d 100755
--- a/authorities/authorities-home.pl
+++ b/authorities/authorities-home.pl
@@ -54,7 +54,6 @@ if ( $op eq "delete" ) {
             template_name   => "authorities/authorities-home.tt",
             query           => $query,
             type            => 'intranet',
-            authnotrequired => 0,
             flagsrequired   => { catalogue => 1 },
             debug           => 1,
         }
@@ -105,7 +104,6 @@ if ( $op eq "do_search" ) {
             template_name   => "authorities/searchresultlist.tt",
             query           => $query,
             type            => 'intranet',
-            authnotrequired => 0,
             flagsrequired   => { catalogue => 1 },
             debug           => 1,
         }
@@ -204,7 +202,6 @@ if ( $op eq '' ) {
             template_name   => "authorities/authorities-home.tt",
             query           => $query,
             type            => 'intranet',
-            authnotrequired => 0,
             flagsrequired   => { catalogue => 1 },
             debug           => 1,
         }
diff --git a/authorities/authorities.pl b/authorities/authorities.pl
index e422cafb36..b037583975 100755
--- a/authorities/authorities.pl
+++ b/authorities/authorities.pl
@@ -571,7 +571,6 @@ my ($template, $loggedinuser, $cookie)
     = get_template_and_user({template_name => "authorities/authorities.tt",
                             query => $input,
                             type => "intranet",
-                            authnotrequired => 0,
                             flagsrequired => {editauthorities => 1},
                             debug => 1,
                             });
diff --git a/authorities/blinddetail-biblio-search.pl b/authorities/blinddetail-biblio-search.pl
index 993615dfdb..ed091a2c08 100755
--- a/authorities/blinddetail-biblio-search.pl
+++ b/authorities/blinddetail-biblio-search.pl
@@ -64,7 +64,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         template_name   => "authorities/blinddetail-biblio-search.tt",
         query           => $query,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { editcatalogue => 'edit_catalogue' },
     }
 );
diff --git a/authorities/detail-biblio-search.pl b/authorities/detail-biblio-search.pl
index 4936b176bf..5370ce19e4 100755
--- a/authorities/detail-biblio-search.pl
+++ b/authorities/detail-biblio-search.pl
@@ -67,7 +67,6 @@ my ($template, $loggedinuser, $cookie) = get_template_and_user(
         template_name   => "authorities/detail-biblio-search.tt",
         query           => $query,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { catalogue => 1 },
         debug           => 1,
     }
diff --git a/authorities/detail.pl b/authorities/detail.pl
index ca1654461d..dee6ae9422 100755
--- a/authorities/detail.pl
+++ b/authorities/detail.pl
@@ -174,7 +174,6 @@ my ($template, $loggedinuser, $cookie) = get_template_and_user(
         template_name   => "authorities/detail.tt",
         query           => $query,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { catalogue => 1 },
         debug           => 1,
     }
diff --git a/authorities/export.pl b/authorities/export.pl
index fbb675eec0..2d7430983a 100755
--- a/authorities/export.pl
+++ b/authorities/export.pl
@@ -13,7 +13,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         template_name   => "tools/export.tt",
         query           => $query,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { catalogue => 1 },
         debug           => 1,
     }
diff --git a/authorities/merge.pl b/authorities/merge.pl
index 8943ba9355..a8e56096f4 100755
--- a/authorities/merge.pl
+++ b/authorities/merge.pl
@@ -40,7 +40,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         template_name   => "authorities/merge.tt",
         query           => $input,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { editauthorities => 1 },
     }
 );
diff --git a/basket/downloadcart.pl b/basket/downloadcart.pl
index 487e9c626a..6115f96707 100755
--- a/basket/downloadcart.pl
+++ b/basket/downloadcart.pl
@@ -39,7 +39,6 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user (
         template_name   => "basket/downloadcart.tt",
         query           => $query,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { catalogue => 1 },
     }
 );
diff --git a/basket/sendbasket.pl b/basket/sendbasket.pl
index 2076c425fa..52ca4797ea 100755
--- a/basket/sendbasket.pl
+++ b/basket/sendbasket.pl
@@ -39,7 +39,6 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user (
         template_name   => "basket/sendbasketform.tt",
         query           => $query,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { catalogue => 1 },
     }
 );
diff --git a/catalogue/ISBDdetail.pl b/catalogue/ISBDdetail.pl
index aade9c90be..bdf379645f 100755
--- a/catalogue/ISBDdetail.pl
+++ b/catalogue/ISBDdetail.pl
@@ -64,7 +64,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         template_name => "catalogue/ISBDdetail.tt",
         query         => $query,
         type          => "intranet",
-	authnotrequired => 0,
 	flagsrequired   => { catalogue => 1 },
     }
 );
diff --git a/catalogue/MARCdetail.pl b/catalogue/MARCdetail.pl
index ab53d108d5..2c878e01a4 100755
--- a/catalogue/MARCdetail.pl
+++ b/catalogue/MARCdetail.pl
@@ -81,7 +81,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         template_name   => "catalogue/MARCdetail.tt",
         query           => $query,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { catalogue => 1 },
         debug           => 1,
     }
diff --git a/catalogue/detail.pl b/catalogue/detail.pl
index 0dfd0cca17..0031524314 100755
--- a/catalogue/detail.pl
+++ b/catalogue/detail.pl
@@ -58,7 +58,6 @@ my ( $template, $borrowernumber, $cookie, $flags ) = get_template_and_user(
     template_name   =>  'catalogue/detail.tt',
         query           => $query,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { catalogue => 1 },
     }
 );
diff --git a/catalogue/export.pl b/catalogue/export.pl
index ac8a202dad..80f3f156cf 100755
--- a/catalogue/export.pl
+++ b/catalogue/export.pl
@@ -15,7 +15,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user({
     template_name   => "tools/export.tt",
     query           => $query,
     type            => "intranet",
-    authnotrequired => 0,
     flagsrequired   => { catalogue => 1 },
     debug           => 1,
     });
diff --git a/catalogue/imageviewer.pl b/catalogue/imageviewer.pl
index 009b82ecf1..d69ad130b4 100755
--- a/catalogue/imageviewer.pl
+++ b/catalogue/imageviewer.pl
@@ -37,7 +37,6 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
         template_name   => "catalogue/imageviewer.tt",
         query           => $query,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { catalogue => 1 },
     }
 );
diff --git a/catalogue/issuehistory.pl b/catalogue/issuehistory.pl
index 0c50dcbb88..0630489a95 100755
--- a/catalogue/issuehistory.pl
+++ b/catalogue/issuehistory.pl
@@ -36,7 +36,6 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
         template_name   => "catalogue/issuehistory.tt",
         query           => $query,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { catalogue => 1 },
     }
 );
diff --git a/catalogue/itemsearch.pl b/catalogue/itemsearch.pl
index 4cb76d8b4e..c887bf843b 100755
--- a/catalogue/itemsearch.pl
+++ b/catalogue/itemsearch.pl
@@ -93,7 +93,6 @@ my ($template, $borrowernumber, $cookie) = get_template_and_user({
     template_name => $template_name,
     query => $cgi,
     type => 'intranet',
-    authnotrequired => 0,
     flagsrequired   => { catalogue => 1 },
 });
 
diff --git a/catalogue/labeledMARCdetail.pl b/catalogue/labeledMARCdetail.pl
index 7c3b77bc9a..6a61b851a9 100755
--- a/catalogue/labeledMARCdetail.pl
+++ b/catalogue/labeledMARCdetail.pl
@@ -49,7 +49,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         template_name   => "catalogue/labeledMARCdetail.tt",
         query           => $query,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { catalogue => 1 },
         debug           => 1,
     }
diff --git a/catalogue/moredetail.pl b/catalogue/moredetail.pl
index 17bf677c06..f845bda584 100755
--- a/catalogue/moredetail.pl
+++ b/catalogue/moredetail.pl
@@ -45,7 +45,6 @@ my ($template, $loggedinuser, $cookie) = get_template_and_user(
         template_name   => 'catalogue/moredetail.tt',
         query           => $query,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { catalogue => 1 },
     }
 );
diff --git a/catalogue/search-history.pl b/catalogue/search-history.pl
index f6714e11c6..6a920c6027 100755
--- a/catalogue/search-history.pl
+++ b/catalogue/search-history.pl
@@ -31,7 +31,6 @@ my ($template, $loggedinuser, $cookie) = get_template_and_user({
     template_name   => 'catalogue/search-history.tt',
     query           => $cgi,
     type            => "intranet",
-    authnotrequired => 0,
     flagsrequired   => {catalogue => 1},
 });
 
diff --git a/catalogue/search.pl b/catalogue/search.pl
index 6ef44ae30d..c168145a22 100755
--- a/catalogue/search.pl
+++ b/catalogue/search.pl
@@ -182,7 +182,6 @@ my ($template, $borrowernumber, $cookie) = get_template_and_user({
     template_name => $template_name,
     query => $cgi,
     type => "intranet",
-    authnotrequired => 0,
     flagsrequired   => { catalogue => 1 },
     }
 );
diff --git a/catalogue/showmarc.pl b/catalogue/showmarc.pl
index 13bde06693..e4fef1fedb 100755
--- a/catalogue/showmarc.pl
+++ b/catalogue/showmarc.pl
@@ -41,7 +41,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     template_name   => "catalogue/showmarc.tt",
     query           => $input,
     type            => "intranet",
-    authnotrequired => 0,
     flagsrequired   => { catalogue => 1  },
     debug           => 1,
   }
diff --git a/catalogue/stockrotation.pl b/catalogue/stockrotation.pl
index 250167c28a..a314b1525b 100755
--- a/catalogue/stockrotation.pl
+++ b/catalogue/stockrotation.pl
@@ -57,7 +57,6 @@ my ($template, $loggedinuser, $cookie) = get_template_and_user(
         template_name   => 'catalogue/stockrotation.tt',
         query           => $input,
         type            => 'intranet',
-        authnotrequired => 0,
         flagsrequired   => {
             catalogue => 1,
             stockrotation => 'manage_rota_items',
diff --git a/cataloguing/addbiblio.pl b/cataloguing/addbiblio.pl
index 6e30258299..61729f7c4b 100755
--- a/cataloguing/addbiblio.pl
+++ b/cataloguing/addbiblio.pl
@@ -715,7 +715,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         template_name   => "cataloguing/addbiblio.tt",
         query           => $input,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { editcatalogue => $userflags },
     }
 );
diff --git a/cataloguing/addbooks.pl b/cataloguing/addbooks.pl
index f3b2e43fbb..42245d6dbd 100755
--- a/cataloguing/addbooks.pl
+++ b/cataloguing/addbooks.pl
@@ -56,7 +56,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         template_name   => "cataloguing/addbooks.tt",
         query           => $input,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { editcatalogue => '*' },
         debug           => 1,
     }
diff --git a/cataloguing/additem.pl b/cataloguing/additem.pl
index 3b5f2b7ef0..26f2825f83 100755
--- a/cataloguing/additem.pl
+++ b/cataloguing/additem.pl
@@ -409,7 +409,6 @@ my ($template, $loggedinuser, $cookie)
     = get_template_and_user({template_name => "cataloguing/additem.tt",
                  query => $input,
                  type => "intranet",
-                 authnotrequired => 0,
                  flagsrequired => {editcatalogue => $userflags},
                  debug => 1,
                  });
diff --git a/cataloguing/editor.pl b/cataloguing/editor.pl
index 7fb34cfe1e..454f319c6e 100755
--- a/cataloguing/editor.pl
+++ b/cataloguing/editor.pl
@@ -40,7 +40,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         template_name   => 'cataloguing/editor.tt',
         query           => $input,
         type            => 'intranet',
-        authnotrequired => 0,
         flagsrequired   => {
             editcatalogue => {
                 'edit_catalogue'  => 1,
diff --git a/cataloguing/linkitem.pl b/cataloguing/linkitem.pl
index 4ea4727559..72e25e622e 100755
--- a/cataloguing/linkitem.pl
+++ b/cataloguing/linkitem.pl
@@ -40,7 +40,6 @@ my ($template, $loggedinuser, $cookie) = get_template_and_user(
         template_name   => "cataloguing/linkitem.tt",
         query           => $query,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { editcatalogue => 'edit_catalogue' },
         debug           => 1,
     }
diff --git a/cataloguing/merge.pl b/cataloguing/merge.pl
index 146e88e598..baf2b3057a 100755
--- a/cataloguing/merge.pl
+++ b/cataloguing/merge.pl
@@ -45,7 +45,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         template_name   => "cataloguing/merge.tt",
         query           => $input,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { editcatalogue => 'edit_catalogue' },
     }
 );
diff --git a/cataloguing/moveitem.pl b/cataloguing/moveitem.pl
index 18474ac343..c5e6bca981 100755
--- a/cataloguing/moveitem.pl
+++ b/cataloguing/moveitem.pl
@@ -52,7 +52,6 @@ my ($template, $loggedinuser, $cookie) = get_template_and_user(
         template_name   => "cataloguing/moveitem.tt",
         query           => $query,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { editcatalogue => 'edit_items' },
         debug           => 1,
     }
diff --git a/cataloguing/value_builder/EXAMPLE.pl b/cataloguing/value_builder/EXAMPLE.pl
index 61204e9fd8..25809acaa2 100644
--- a/cataloguing/value_builder/EXAMPLE.pl
+++ b/cataloguing/value_builder/EXAMPLE.pl
@@ -116,7 +116,6 @@ my $launcher= sub {
         template_name => "cataloguing/value_builder/EXAMPLE.tt",
         query => $cgi,
         type => "intranet",
-        authnotrequired => 0,
         flagsrequired => {editcatalogue => '*'},
     });
     $template->param(
diff --git a/cataloguing/value_builder/callnumber-KU.pl b/cataloguing/value_builder/callnumber-KU.pl
index 5cbdd25905..7316afc617 100755
--- a/cataloguing/value_builder/callnumber-KU.pl
+++ b/cataloguing/value_builder/callnumber-KU.pl
@@ -70,7 +70,6 @@ my $launcher = sub {
         template_name   => "cataloguing/value_builder/ajax.tt",
         query           => $input,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => {editcatalogue => '*'},
         debug           => 1,
     });
diff --git a/cataloguing/value_builder/callnumber.pl b/cataloguing/value_builder/callnumber.pl
index aeca228a20..05ef8f54ee 100755
--- a/cataloguing/value_builder/callnumber.pl
+++ b/cataloguing/value_builder/callnumber.pl
@@ -68,7 +68,6 @@ my $launcher = sub {
         template_name   => "cataloguing/value_builder/ajax.tt",
         query           => $input,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => {editcatalogue => '*'},
         debug           => 1,
     });
diff --git a/cataloguing/value_builder/cn_browser.pl b/cataloguing/value_builder/cn_browser.pl
index 7aa8cd1b80..178025cb32 100755
--- a/cataloguing/value_builder/cn_browser.pl
+++ b/cataloguing/value_builder/cn_browser.pl
@@ -56,7 +56,6 @@ my $launcher = sub {
         {   template_name   => "cataloguing/value_builder/cn_browser.tt",
             query           => $cgi,
             type            => "intranet",
-            authnotrequired => 0,
             flagsrequired   => { catalogue => 1 },
         }
     );
diff --git a/cataloguing/value_builder/macles.pl b/cataloguing/value_builder/macles.pl
index bed0c88f66..d50edfb2d4 100755
--- a/cataloguing/value_builder/macles.pl
+++ b/cataloguing/value_builder/macles.pl
@@ -162,7 +162,6 @@ my $launcher = sub {
         = get_template_and_user({template_name => "cataloguing/value_builder/macles.tt",
                     query => $input,
                     type => "intranet",
-                    authnotrequired => 0,
                     flagsrequired => {editcatalogue => '*'},
                     debug => 1,
                     });
diff --git a/cataloguing/value_builder/marc21_field_006.pl b/cataloguing/value_builder/marc21_field_006.pl
index aeb5df1949..b8740b13c9 100755
--- a/cataloguing/value_builder/marc21_field_006.pl
+++ b/cataloguing/value_builder/marc21_field_006.pl
@@ -60,7 +60,6 @@ my $launcher = sub {
         {   template_name   => "cataloguing/value_builder/marc21_field_006.tt",
             query           => $input,
             type            => "intranet",
-            authnotrequired => 0,
             flagsrequired   => { editcatalogue => '*' },
             debug           => 1,
         }
diff --git a/cataloguing/value_builder/marc21_field_007.pl b/cataloguing/value_builder/marc21_field_007.pl
index a64f407e59..4aab5a8b15 100755
--- a/cataloguing/value_builder/marc21_field_007.pl
+++ b/cataloguing/value_builder/marc21_field_007.pl
@@ -59,7 +59,6 @@ my $launcher = sub {
         {   template_name   => "cataloguing/value_builder/marc21_field_007.tt",
             query           => $input,
             type            => "intranet",
-            authnotrequired => 0,
             flagsrequired   => { editcatalogue => '*' },
             debug           => 1,
         }
diff --git a/cataloguing/value_builder/marc21_field_008.pl b/cataloguing/value_builder/marc21_field_008.pl
index 4acbb6946f..b046042b38 100755
--- a/cataloguing/value_builder/marc21_field_008.pl
+++ b/cataloguing/value_builder/marc21_field_008.pl
@@ -139,7 +139,6 @@ my $launcher = sub {
         {   template_name   => "cataloguing/value_builder/marc21_field_008.tt",
             query           => $input,
             type            => "intranet",
-            authnotrequired => 0,
             flagsrequired   => { editcatalogue => '*' },
             debug           => 1,
         }
diff --git a/cataloguing/value_builder/marc21_field_008_authorities.pl b/cataloguing/value_builder/marc21_field_008_authorities.pl
index fe109a2498..1eb45d0070 100755
--- a/cataloguing/value_builder/marc21_field_008_authorities.pl
+++ b/cataloguing/value_builder/marc21_field_008_authorities.pl
@@ -81,7 +81,6 @@ my $launcher = sub {
     = get_template_and_user({template_name => "cataloguing/value_builder/marc21_field_008_authorities.tt",
                  query => $input,
                  type => "intranet",
-                 authnotrequired => 0,
                  flagsrequired => {editcatalogue => '*'},
                  debug => 1,
                  });
diff --git a/cataloguing/value_builder/marc21_field_008_classifications.pl b/cataloguing/value_builder/marc21_field_008_classifications.pl
index f066c7ec21..8d6ccd05c6 100755
--- a/cataloguing/value_builder/marc21_field_008_classifications.pl
+++ b/cataloguing/value_builder/marc21_field_008_classifications.pl
@@ -70,7 +70,6 @@ my $launcher = sub {
         template_name => "cataloguing/value_builder/marc21_field_008_classifications.tt",
         query => $input,
         type => "intranet",
-        authnotrequired => 0,
         flagsrequired => { editcatalogue => '*' },
         debug => 1,
     });
diff --git a/cataloguing/value_builder/marc21_leader.pl b/cataloguing/value_builder/marc21_leader.pl
index 755300a827..452f45176a 100755
--- a/cataloguing/value_builder/marc21_leader.pl
+++ b/cataloguing/value_builder/marc21_leader.pl
@@ -63,7 +63,6 @@ my $launcher = sub {
         {   template_name   => "cataloguing/value_builder/marc21_leader.tt",
             query           => $input,
             type            => "intranet",
-            authnotrequired => 0,
             flagsrequired   => { editcatalogue => '*' },
             debug           => 1,
         }
diff --git a/cataloguing/value_builder/marc21_leader_authorities.pl b/cataloguing/value_builder/marc21_leader_authorities.pl
index 1b7aa7e1cd..86e6b8e195 100755
--- a/cataloguing/value_builder/marc21_leader_authorities.pl
+++ b/cataloguing/value_builder/marc21_leader_authorities.pl
@@ -66,7 +66,6 @@ my $launcher = sub {
         {   template_name   => "cataloguing/value_builder/marc21_leader_authorities.tt",
             query           => $input,
             type            => "intranet",
-            authnotrequired => 0,
             flagsrequired   => { editcatalogue => '*' },
             debug           => 1,
         }
diff --git a/cataloguing/value_builder/marc21_linking_section.pl b/cataloguing/value_builder/marc21_linking_section.pl
index f537516c04..1b15549d93 100755
--- a/cataloguing/value_builder/marc21_linking_section.pl
+++ b/cataloguing/value_builder/marc21_linking_section.pl
@@ -78,7 +78,6 @@ my $launcher = sub {
             {   template_name   => "cataloguing/value_builder/marc21_linking_section.tt",
                 query           => $query,
                 type            => "intranet",
-                authnotrequired => 0,
                 flagsrequired   => { editcatalogue => '*' },
                 debug           => 1,
             }
@@ -199,7 +198,6 @@ my $launcher = sub {
             {   template_name   => "cataloguing/value_builder/marc21_linking_section.tt",
                 query           => $query,
                 type            => 'intranet',
-                authnotrequired => 0,
                 debug           => 1,
             }
         );
@@ -307,7 +305,6 @@ my $launcher = sub {
             {   template_name   => "cataloguing/value_builder/marc21_linking_section.tt",
                 query           => $query,
                 type            => "intranet",
-                authnotrequired => 0,
             }
         );
 
diff --git a/cataloguing/value_builder/normarc_field_007.pl b/cataloguing/value_builder/normarc_field_007.pl
index 2931b4204e..87f2329aef 100755
--- a/cataloguing/value_builder/normarc_field_007.pl
+++ b/cataloguing/value_builder/normarc_field_007.pl
@@ -55,7 +55,6 @@ my ($template, $loggedinuser, $cookie)
     = get_template_and_user({template_name => "cataloguing/value_builder/normarc_field_007.tt",
 			     query => $input,
 			     type => "intranet",
-			     authnotrequired => 0,
 			     flagsrequired => {editcatalogue => 1},
 			     debug => 1,
 			     });
diff --git a/cataloguing/value_builder/normarc_field_008.pl b/cataloguing/value_builder/normarc_field_008.pl
index a156cd268e..1a5893f35d 100755
--- a/cataloguing/value_builder/normarc_field_008.pl
+++ b/cataloguing/value_builder/normarc_field_008.pl
@@ -79,7 +79,6 @@ sub plugin {
         {   template_name   => "cataloguing/value_builder/normarc_field_008.tt",
             query           => $input,
             type            => "intranet",
-            authnotrequired => 0,
             flagsrequired   => { editcatalogue => 1 },
             debug           => 1,
         }
diff --git a/cataloguing/value_builder/normarc_leader.pl b/cataloguing/value_builder/normarc_leader.pl
index 29a1a7aef2..debc3aa0bf 100755
--- a/cataloguing/value_builder/normarc_leader.pl
+++ b/cataloguing/value_builder/normarc_leader.pl
@@ -64,7 +64,6 @@ my ($template, $loggedinuser, $cookie)
     = get_template_and_user({template_name => "cataloguing/value_builder/normarc_leader.tt",
 			     query => $input,
 			     type => "intranet",
-			     authnotrequired => 0,
 			     flagsrequired => {editcatalogue => 1},
 			     debug => 1,
 			     });
diff --git a/cataloguing/value_builder/stocknumberAV.pl b/cataloguing/value_builder/stocknumberAV.pl
index ac9d41f537..ed4bc24383 100755
--- a/cataloguing/value_builder/stocknumberAV.pl
+++ b/cataloguing/value_builder/stocknumberAV.pl
@@ -75,7 +75,6 @@ my $launcher = sub {
         {   template_name   => "cataloguing/value_builder/ajax.tt",
             query           => $input,
             type            => "intranet",
-            authnotrequired => 0,
             flagsrequired   => { editcatalogue => '*' },
             debug           => 1,
         }
diff --git a/cataloguing/value_builder/stocknumberam123.pl b/cataloguing/value_builder/stocknumberam123.pl
index afed9e96ee..13872ba5f4 100755
--- a/cataloguing/value_builder/stocknumberam123.pl
+++ b/cataloguing/value_builder/stocknumberam123.pl
@@ -69,7 +69,6 @@ my $launcher = sub {
         template_name   => "cataloguing/value_builder/ajax.tt",
         query           => $input,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => {editcatalogue => '*'},
         debug           => 1,
     });
diff --git a/cataloguing/value_builder/unimarc_field_010.pl b/cataloguing/value_builder/unimarc_field_010.pl
index 5c68b184cd..439af9bd2a 100755
--- a/cataloguing/value_builder/unimarc_field_010.pl
+++ b/cataloguing/value_builder/unimarc_field_010.pl
@@ -60,7 +60,6 @@ sub plugin {
             = get_template_and_user({template_name => "cataloguing/value_builder/ajax.tt",
                                     query => $input,
                                     type => "intranet",
-                                    authnotrequired => 0,
                                     flagsrequired => {editcatalogue => '*'},
                                     debug => 1,
                                     });
diff --git a/cataloguing/value_builder/unimarc_field_100.pl b/cataloguing/value_builder/unimarc_field_100.pl
index efb6772de0..ea52b36971 100755
--- a/cataloguing/value_builder/unimarc_field_100.pl
+++ b/cataloguing/value_builder/unimarc_field_100.pl
@@ -65,7 +65,6 @@ sub plugin {
             template_name => "cataloguing/value_builder/unimarc_field_100.tt",
             query         => $input,
             type          => "intranet",
-            authnotrequired => 0,
             flagsrequired   => { editcatalogue => '*' },
             debug           => 1,
         }
diff --git a/cataloguing/value_builder/unimarc_field_100_authorities.pl b/cataloguing/value_builder/unimarc_field_100_authorities.pl
index ac5d506112..0f48c14a6e 100755
--- a/cataloguing/value_builder/unimarc_field_100_authorities.pl
+++ b/cataloguing/value_builder/unimarc_field_100_authorities.pl
@@ -62,7 +62,6 @@ sub plugin {
             template_name => "cataloguing/value_builder/unimarc_field_100_authorities.tt",
             query         => $input,
             type          => "intranet",
-            authnotrequired => 0,
             flagsrequired   => { editcatalogue => '*' },
             debug           => 1,
         }
diff --git a/cataloguing/value_builder/unimarc_field_105.pl b/cataloguing/value_builder/unimarc_field_105.pl
index 0afc26f2cc..9dca3d4b71 100755
--- a/cataloguing/value_builder/unimarc_field_105.pl
+++ b/cataloguing/value_builder/unimarc_field_105.pl
@@ -56,7 +56,6 @@ sub plugin {
     = get_template_and_user({template_name => "cataloguing/value_builder/unimarc_field_105.tt",
 			     query => $input,
 			     type => "intranet",
-			     authnotrequired => 0,
 			     flagsrequired => {editcatalogue => '*'},
 			     debug => 1,
 			     });
diff --git a/cataloguing/value_builder/unimarc_field_106.pl b/cataloguing/value_builder/unimarc_field_106.pl
index b7e9cc3396..f11a021a47 100755
--- a/cataloguing/value_builder/unimarc_field_106.pl
+++ b/cataloguing/value_builder/unimarc_field_106.pl
@@ -52,7 +52,6 @@ my ($template, $loggedinuser, $cookie)
     = get_template_and_user({template_name => "cataloguing/value_builder/unimarc_field_106.tt",
 			     query => $input,
 			     type => "intranet",
-			     authnotrequired => 0,
 			     flagsrequired => {editcatalogue => '*'},
 			     debug => 1,
 			     });
diff --git a/cataloguing/value_builder/unimarc_field_110.pl b/cataloguing/value_builder/unimarc_field_110.pl
index 547b4087bd..ddde049ff6 100755
--- a/cataloguing/value_builder/unimarc_field_110.pl
+++ b/cataloguing/value_builder/unimarc_field_110.pl
@@ -55,7 +55,6 @@ my ($template, $loggedinuser, $cookie)
     = get_template_and_user({template_name => "cataloguing/value_builder/unimarc_field_110.tt",
 			     query => $input,
 			     type => "intranet",
-			     authnotrequired => 0,
 			     flagsrequired => {editcatalogue => '*'},
 			     debug => 1,
 			     });
diff --git a/cataloguing/value_builder/unimarc_field_115a.pl b/cataloguing/value_builder/unimarc_field_115a.pl
index 46b0fd55e7..17ad4d32a5 100755
--- a/cataloguing/value_builder/unimarc_field_115a.pl
+++ b/cataloguing/value_builder/unimarc_field_115a.pl
@@ -62,7 +62,6 @@ sub plugin {
               "cataloguing/value_builder/unimarc_field_115a.tt",
             query           => $input,
             type            => "intranet",
-            authnotrequired => 0,
             flagsrequired   => { editcatalogue => '*' },
             debug           => 1,
         }
diff --git a/cataloguing/value_builder/unimarc_field_115b.pl b/cataloguing/value_builder/unimarc_field_115b.pl
index 582b42395b..685448decd 100755
--- a/cataloguing/value_builder/unimarc_field_115b.pl
+++ b/cataloguing/value_builder/unimarc_field_115b.pl
@@ -56,7 +56,6 @@ sub plugin {
               "cataloguing/value_builder/unimarc_field_115b.tt",
             query           => $input,
             type            => "intranet",
-            authnotrequired => 0,
             flagsrequired   => { editcatalogue => '*' },
             debug           => 1,
         }
diff --git a/cataloguing/value_builder/unimarc_field_116.pl b/cataloguing/value_builder/unimarc_field_116.pl
index fd3a982ab3..ef083f6aac 100755
--- a/cataloguing/value_builder/unimarc_field_116.pl
+++ b/cataloguing/value_builder/unimarc_field_116.pl
@@ -55,7 +55,6 @@ sub plugin {
             template_name => "cataloguing/value_builder/unimarc_field_116.tt",
             query         => $input,
             type          => "intranet",
-            authnotrequired => 0,
             flagsrequired   => { editcatalogue => '*' },
             debug           => 1,
         }
diff --git a/cataloguing/value_builder/unimarc_field_117.pl b/cataloguing/value_builder/unimarc_field_117.pl
index 831f4725aa..dcbeddfb31 100755
--- a/cataloguing/value_builder/unimarc_field_117.pl
+++ b/cataloguing/value_builder/unimarc_field_117.pl
@@ -54,7 +54,6 @@ my ($template, $loggedinuser, $cookie)
     = get_template_and_user({template_name => "cataloguing/value_builder/unimarc_field_117.tt",
 			     query => $input,
 			     type => "intranet",
-			     authnotrequired => 0,
 			     flagsrequired => {editcatalogue => '*'},
 			     debug => 1,
 			     });
diff --git a/cataloguing/value_builder/unimarc_field_120.pl b/cataloguing/value_builder/unimarc_field_120.pl
index 50abed84fe..6ee6d0aa19 100755
--- a/cataloguing/value_builder/unimarc_field_120.pl
+++ b/cataloguing/value_builder/unimarc_field_120.pl
@@ -58,7 +58,6 @@ my ($template, $loggedinuser, $cookie)
     = get_template_and_user({template_name => "cataloguing/value_builder/unimarc_field_120.tt",
 			     query => $input,
 			     type => "intranet",
-			     authnotrequired => 0,
 			     flagsrequired => {editcatalogue => '*'},
 			     debug => 1,
 			     });
diff --git a/cataloguing/value_builder/unimarc_field_121a.pl b/cataloguing/value_builder/unimarc_field_121a.pl
index f70b5085b6..1ef29eb2ca 100755
--- a/cataloguing/value_builder/unimarc_field_121a.pl
+++ b/cataloguing/value_builder/unimarc_field_121a.pl
@@ -57,7 +57,6 @@ my ($template, $loggedinuser, $cookie)
     = get_template_and_user({template_name => "cataloguing/value_builder/unimarc_field_121a.tt",
 			     query => $input,
 			     type => "intranet",
-			     authnotrequired => 0,
 			     flagsrequired => {editcatalogue => '*'},
 			     debug => 1,
 			     });
diff --git a/cataloguing/value_builder/unimarc_field_121b.pl b/cataloguing/value_builder/unimarc_field_121b.pl
index ffb61e9ea4..acf8dd143b 100755
--- a/cataloguing/value_builder/unimarc_field_121b.pl
+++ b/cataloguing/value_builder/unimarc_field_121b.pl
@@ -53,7 +53,6 @@ my ($template, $loggedinuser, $cookie)
     = get_template_and_user({template_name => "cataloguing/value_builder/unimarc_field_121b.tt",
 			     query => $input,
 			     type => "intranet",
-			     authnotrequired => 0,
 			     flagsrequired => {editcatalogue => '*'},
 			     debug => 1,
 			     });
diff --git a/cataloguing/value_builder/unimarc_field_122.pl b/cataloguing/value_builder/unimarc_field_122.pl
index c0b9187ce4..133411f7ae 100755
--- a/cataloguing/value_builder/unimarc_field_122.pl
+++ b/cataloguing/value_builder/unimarc_field_122.pl
@@ -53,7 +53,6 @@ my ($template, $loggedinuser, $cookie)
     = get_template_and_user({template_name => "cataloguing/value_builder/unimarc_field_122.tt",
 			     query => $input,
 			     type => "intranet",
-			     authnotrequired => 0,
 			     flagsrequired => {editcatalogue => '*'},
 			     debug => 1,
 			     });
diff --git a/cataloguing/value_builder/unimarc_field_123a.pl b/cataloguing/value_builder/unimarc_field_123a.pl
index 979ed894aa..1b4d82ae70 100755
--- a/cataloguing/value_builder/unimarc_field_123a.pl
+++ b/cataloguing/value_builder/unimarc_field_123a.pl
@@ -53,7 +53,6 @@ my ($template, $loggedinuser, $cookie)
     = get_template_and_user({template_name => "cataloguing/value_builder/unimarc_field_123a.tt",
 			     query => $input,
 			     type => "intranet",
-			     authnotrequired => 0,
 			     flagsrequired => {editcatalogue => '*'},
 			     debug => 1,
 			     });
diff --git a/cataloguing/value_builder/unimarc_field_123d.pl b/cataloguing/value_builder/unimarc_field_123d.pl
index 5863afb56e..2a23edcadf 100755
--- a/cataloguing/value_builder/unimarc_field_123d.pl
+++ b/cataloguing/value_builder/unimarc_field_123d.pl
@@ -54,7 +54,6 @@ my ($template, $loggedinuser, $cookie)
     = get_template_and_user({template_name => "cataloguing/value_builder/unimarc_field_123g.tt",
 			     query => $input,
 			     type => "intranet",
-			     authnotrequired => 0,
 			     flagsrequired => {editcatalogue => '*'},
 			     debug => 1,
 			     });
diff --git a/cataloguing/value_builder/unimarc_field_123e.pl b/cataloguing/value_builder/unimarc_field_123e.pl
index 5863afb56e..2a23edcadf 100755
--- a/cataloguing/value_builder/unimarc_field_123e.pl
+++ b/cataloguing/value_builder/unimarc_field_123e.pl
@@ -54,7 +54,6 @@ my ($template, $loggedinuser, $cookie)
     = get_template_and_user({template_name => "cataloguing/value_builder/unimarc_field_123g.tt",
 			     query => $input,
 			     type => "intranet",
-			     authnotrequired => 0,
 			     flagsrequired => {editcatalogue => '*'},
 			     debug => 1,
 			     });
diff --git a/cataloguing/value_builder/unimarc_field_123f.pl b/cataloguing/value_builder/unimarc_field_123f.pl
index e74a14641a..9446d977d1 100755
--- a/cataloguing/value_builder/unimarc_field_123f.pl
+++ b/cataloguing/value_builder/unimarc_field_123f.pl
@@ -55,7 +55,6 @@ my ($template, $loggedinuser, $cookie)
     = get_template_and_user({template_name => "cataloguing/value_builder/unimarc_field_123g.tt",
 			     query => $input,
 			     type => "intranet",
-			     authnotrequired => 0,
 			     flagsrequired => {editcatalogue => '*'},
 			     debug => 1,
 			     });
diff --git a/cataloguing/value_builder/unimarc_field_123g.pl b/cataloguing/value_builder/unimarc_field_123g.pl
index 5863afb56e..2a23edcadf 100755
--- a/cataloguing/value_builder/unimarc_field_123g.pl
+++ b/cataloguing/value_builder/unimarc_field_123g.pl
@@ -54,7 +54,6 @@ my ($template, $loggedinuser, $cookie)
     = get_template_and_user({template_name => "cataloguing/value_builder/unimarc_field_123g.tt",
 			     query => $input,
 			     type => "intranet",
-			     authnotrequired => 0,
 			     flagsrequired => {editcatalogue => '*'},
 			     debug => 1,
 			     });
diff --git a/cataloguing/value_builder/unimarc_field_123i.pl b/cataloguing/value_builder/unimarc_field_123i.pl
index ffe64bba0d..5e1203bbf1 100755
--- a/cataloguing/value_builder/unimarc_field_123i.pl
+++ b/cataloguing/value_builder/unimarc_field_123i.pl
@@ -54,7 +54,6 @@ my ($template, $loggedinuser, $cookie)
     = get_template_and_user({template_name => "cataloguing/value_builder/unimarc_field_123i_j.tt",
 			     query => $input,
 			     type => "intranet",
-			     authnotrequired => 0,
 			     flagsrequired => {editcatalogue => '*'},
 			     debug => 1,
 			     });
diff --git a/cataloguing/value_builder/unimarc_field_123j.pl b/cataloguing/value_builder/unimarc_field_123j.pl
index 695ee84ad0..cdbdcf2150 100755
--- a/cataloguing/value_builder/unimarc_field_123j.pl
+++ b/cataloguing/value_builder/unimarc_field_123j.pl
@@ -57,7 +57,6 @@ sub plugin {
             template_name => "cataloguing/value_builder/unimarc_field_123i_j.tt",
 			query => $input,
 			type => "intranet",
-			authnotrequired => 0,
 			flagsrequired => {editcatalogue => '*'},
 			debug => 1,
 		}
diff --git a/cataloguing/value_builder/unimarc_field_124.pl b/cataloguing/value_builder/unimarc_field_124.pl
index 0a16dcde17..f5bfe46af2 100755
--- a/cataloguing/value_builder/unimarc_field_124.pl
+++ b/cataloguing/value_builder/unimarc_field_124.pl
@@ -54,7 +54,6 @@ my ($template, $loggedinuser, $cookie)
     = get_template_and_user({template_name => "cataloguing/value_builder/unimarc_field_100.tt",
 			     query => $input,
 			     type => "intranet",
-			     authnotrequired => 0,
 			     flagsrequired => {editcatalogue => '*'},
 			     debug => 1,
 			     });
diff --git a/cataloguing/value_builder/unimarc_field_124a.pl b/cataloguing/value_builder/unimarc_field_124a.pl
index fee1544fd6..43885a7f3a 100755
--- a/cataloguing/value_builder/unimarc_field_124a.pl
+++ b/cataloguing/value_builder/unimarc_field_124a.pl
@@ -55,7 +55,6 @@ my ($input) = @_;
             template_name   => "cataloguing/value_builder/unimarc_field_124a.tt",
             query           => $input,
             type            => "intranet",
-            authnotrequired => 0,
             flagsrequired   => { editcatalogue => '*' },
             debug           => 1,
         }
diff --git a/cataloguing/value_builder/unimarc_field_124b.pl b/cataloguing/value_builder/unimarc_field_124b.pl
index f8744a1625..8512632dcd 100755
--- a/cataloguing/value_builder/unimarc_field_124b.pl
+++ b/cataloguing/value_builder/unimarc_field_124b.pl
@@ -54,7 +54,6 @@ my ($template, $loggedinuser, $cookie)
     = get_template_and_user({template_name => "cataloguing/value_builder/unimarc_field_124b.tt",
 			     query => $input,
 			     type => "intranet",
-			     authnotrequired => 0,
 			     flagsrequired => {editcatalogue => '*'},
 			     debug => 1,
 			     });
diff --git a/cataloguing/value_builder/unimarc_field_124c.pl b/cataloguing/value_builder/unimarc_field_124c.pl
index c6441b2232..f56f64c8b5 100755
--- a/cataloguing/value_builder/unimarc_field_124c.pl
+++ b/cataloguing/value_builder/unimarc_field_124c.pl
@@ -54,7 +54,6 @@ my ($template, $loggedinuser, $cookie)
     = get_template_and_user({template_name => "cataloguing/value_builder/unimarc_field_124c.tt",
 			     query => $input,
 			     type => "intranet",
-			     authnotrequired => 0,
 			     flagsrequired => {editcatalogue => '*'},
 			     debug => 1,
 			     });
diff --git a/cataloguing/value_builder/unimarc_field_124d.pl b/cataloguing/value_builder/unimarc_field_124d.pl
index 20d234129f..5f60644c18 100755
--- a/cataloguing/value_builder/unimarc_field_124d.pl
+++ b/cataloguing/value_builder/unimarc_field_124d.pl
@@ -54,7 +54,6 @@ my ($template, $loggedinuser, $cookie)
     = get_template_and_user({template_name => "cataloguing/value_builder/unimarc_field_124d.tt",
 			     query => $input,
 			     type => "intranet",
-			     authnotrequired => 0,
 			     flagsrequired => {editcatalogue => '*'},
 			     debug => 1,
 			     });
diff --git a/cataloguing/value_builder/unimarc_field_124e.pl b/cataloguing/value_builder/unimarc_field_124e.pl
index 5b72823559..51f7b68ca7 100755
--- a/cataloguing/value_builder/unimarc_field_124e.pl
+++ b/cataloguing/value_builder/unimarc_field_124e.pl
@@ -54,7 +54,6 @@ my ($template, $loggedinuser, $cookie)
     = get_template_and_user({template_name => "cataloguing/value_builder/unimarc_field_124e.tt",
 			     query => $input,
 			     type => "intranet",
-			     authnotrequired => 0,
 			     flagsrequired => {editcatalogue => '*'},
 			     debug => 1,
 			     });
diff --git a/cataloguing/value_builder/unimarc_field_124f.pl b/cataloguing/value_builder/unimarc_field_124f.pl
index 2e53479cb4..ff768c13a1 100755
--- a/cataloguing/value_builder/unimarc_field_124f.pl
+++ b/cataloguing/value_builder/unimarc_field_124f.pl
@@ -54,7 +54,6 @@ my ($template, $loggedinuser, $cookie)
     = get_template_and_user({template_name => "cataloguing/value_builder/unimarc_field_124f.tt",
 			     query => $input,
 			     type => "intranet",
-			     authnotrequired => 0,
 			     flagsrequired => {editcatalogue => '*'},
 			     debug => 1,
 			     });
diff --git a/cataloguing/value_builder/unimarc_field_124g.pl b/cataloguing/value_builder/unimarc_field_124g.pl
index e835212138..68fcfd0f78 100755
--- a/cataloguing/value_builder/unimarc_field_124g.pl
+++ b/cataloguing/value_builder/unimarc_field_124g.pl
@@ -54,7 +54,6 @@ my ($template, $loggedinuser, $cookie)
     = get_template_and_user({template_name => "cataloguing/value_builder/unimarc_field_124g.tt",
 			     query => $input,
 			     type => "intranet",
-			     authnotrequired => 0,
 			     flagsrequired => {editcatalogue => '*'},
 			     debug => 1,
 			     });
diff --git a/cataloguing/value_builder/unimarc_field_125.pl b/cataloguing/value_builder/unimarc_field_125.pl
index 7e9c744228..400a290f24 100755
--- a/cataloguing/value_builder/unimarc_field_125.pl
+++ b/cataloguing/value_builder/unimarc_field_125.pl
@@ -60,7 +60,6 @@ my ($template, $loggedinuser, $cookie)
     = get_template_and_user({template_name => "cataloguing/value_builder/unimarc_field_100.tt",
 			     query => $input,
 			     type => "intranet",
-			     authnotrequired => 0,
 			     flagsrequired => {editcatalogue => '*'},
 			     debug => 1,
 			     });
diff --git a/cataloguing/value_builder/unimarc_field_125a.pl b/cataloguing/value_builder/unimarc_field_125a.pl
index ec41917786..67ae25df5a 100755
--- a/cataloguing/value_builder/unimarc_field_125a.pl
+++ b/cataloguing/value_builder/unimarc_field_125a.pl
@@ -54,7 +54,6 @@ my ($template, $loggedinuser, $cookie)
     = get_template_and_user({template_name => "cataloguing/value_builder/unimarc_field_125a.tt",
 			     query => $input,
 			     type => "intranet",
-			     authnotrequired => 0,
 			     flagsrequired => {editcatalogue => '*'},
 			     debug => 1,
 			     });
diff --git a/cataloguing/value_builder/unimarc_field_125b.pl b/cataloguing/value_builder/unimarc_field_125b.pl
index 5035fc44ff..b8e36d9cc1 100755
--- a/cataloguing/value_builder/unimarc_field_125b.pl
+++ b/cataloguing/value_builder/unimarc_field_125b.pl
@@ -57,7 +57,6 @@ my ($template, $loggedinuser, $cookie)
     = get_template_and_user({template_name => "cataloguing/value_builder/unimarc_field_125b.tt",
 			     query => $input,
 			     type => "intranet",
-			     authnotrequired => 0,
 			     flagsrequired => {editcatalogue => '*'},
 			     debug => 1,
 			     });
diff --git a/cataloguing/value_builder/unimarc_field_126.pl b/cataloguing/value_builder/unimarc_field_126.pl
index 0a16dcde17..f5bfe46af2 100755
--- a/cataloguing/value_builder/unimarc_field_126.pl
+++ b/cataloguing/value_builder/unimarc_field_126.pl
@@ -54,7 +54,6 @@ my ($template, $loggedinuser, $cookie)
     = get_template_and_user({template_name => "cataloguing/value_builder/unimarc_field_100.tt",
 			     query => $input,
 			     type => "intranet",
-			     authnotrequired => 0,
 			     flagsrequired => {editcatalogue => '*'},
 			     debug => 1,
 			     });
diff --git a/cataloguing/value_builder/unimarc_field_126a.pl b/cataloguing/value_builder/unimarc_field_126a.pl
index f5bf8140b4..b0e737d910 100755
--- a/cataloguing/value_builder/unimarc_field_126a.pl
+++ b/cataloguing/value_builder/unimarc_field_126a.pl
@@ -57,7 +57,6 @@ my ($template, $loggedinuser, $cookie)
     = get_template_and_user({template_name => "cataloguing/value_builder/unimarc_field_126a.tt",
 			     query => $input,
 			     type => "intranet",
-			     authnotrequired => 0,
 			     flagsrequired => {editcatalogue => '*'},
 			     debug => 1,
 			     });
diff --git a/cataloguing/value_builder/unimarc_field_126b.pl b/cataloguing/value_builder/unimarc_field_126b.pl
index b9538c29b1..d9704624de 100755
--- a/cataloguing/value_builder/unimarc_field_126b.pl
+++ b/cataloguing/value_builder/unimarc_field_126b.pl
@@ -54,7 +54,6 @@ my ($template, $loggedinuser, $cookie)
     = get_template_and_user({template_name => "cataloguing/value_builder/unimarc_field_126b.tt",
 			     query => $input,
 			     type => "intranet",
-			     authnotrequired => 0,
 			     flagsrequired => {editcatalogue => '*'},
 			     debug => 1,
 			     });
diff --git a/cataloguing/value_builder/unimarc_field_127.pl b/cataloguing/value_builder/unimarc_field_127.pl
index f7e2f8aa08..53d740182f 100755
--- a/cataloguing/value_builder/unimarc_field_127.pl
+++ b/cataloguing/value_builder/unimarc_field_127.pl
@@ -54,7 +54,6 @@ my ($template, $loggedinuser, $cookie)
     = get_template_and_user({template_name => "cataloguing/value_builder/unimarc_field_127.tt",
 			     query => $input,
 			     type => "intranet",
-			     authnotrequired => 0,
 			     flagsrequired => {editcatalogue => '*'},
 			     debug => 1,
 			     });
diff --git a/cataloguing/value_builder/unimarc_field_128a.pl b/cataloguing/value_builder/unimarc_field_128a.pl
index c50e2724fd..85ab660505 100755
--- a/cataloguing/value_builder/unimarc_field_128a.pl
+++ b/cataloguing/value_builder/unimarc_field_128a.pl
@@ -54,7 +54,6 @@ my ($template, $loggedinuser, $cookie)
     = get_template_and_user({template_name => "cataloguing/value_builder/unimarc_field_128a.tt",
 			     query => $input,
 			     type => "intranet",
-			     authnotrequired => 0,
 			     flagsrequired => {editcatalogue => '*'},
 			     debug => 1,
 			     });
diff --git a/cataloguing/value_builder/unimarc_field_128b.pl b/cataloguing/value_builder/unimarc_field_128b.pl
index aaa6f44d6c..e32367f783 100755
--- a/cataloguing/value_builder/unimarc_field_128b.pl
+++ b/cataloguing/value_builder/unimarc_field_128b.pl
@@ -57,7 +57,6 @@ my ($template, $loggedinuser, $cookie)
     = get_template_and_user({template_name => "cataloguing/value_builder/unimarc_field_128b.tt",
 			     query => $input,
 			     type => "intranet",
-			     authnotrequired => 0,
 			     flagsrequired => {editcatalogue => '*'},
 			     debug => 1,
 			     });
diff --git a/cataloguing/value_builder/unimarc_field_128c.pl b/cataloguing/value_builder/unimarc_field_128c.pl
index 074bf6fb90..7be92ed030 100755
--- a/cataloguing/value_builder/unimarc_field_128c.pl
+++ b/cataloguing/value_builder/unimarc_field_128c.pl
@@ -54,7 +54,6 @@ my ($template, $loggedinuser, $cookie)
     = get_template_and_user({template_name => "cataloguing/value_builder/unimarc_field_128c.tt",
 			     query => $input,
 			     type => "intranet",
-			     authnotrequired => 0,
 			     flagsrequired => {editcatalogue => '*'},
 			     debug => 1,
 			     });
diff --git a/cataloguing/value_builder/unimarc_field_130.pl b/cataloguing/value_builder/unimarc_field_130.pl
index ab23ad8e83..04d0fb9590 100755
--- a/cataloguing/value_builder/unimarc_field_130.pl
+++ b/cataloguing/value_builder/unimarc_field_130.pl
@@ -58,7 +58,6 @@ my ($template, $loggedinuser, $cookie)
     = get_template_and_user({template_name => "cataloguing/value_builder/unimarc_field_130.tt",
 			     query => $input,
 			     type => "intranet",
-			     authnotrequired => 0,
 			     flagsrequired => {editcatalogue => '*'},
 			     debug => 1,
 			     });
diff --git a/cataloguing/value_builder/unimarc_field_135a.pl b/cataloguing/value_builder/unimarc_field_135a.pl
index c38cd90baa..7a41b59ae8 100755
--- a/cataloguing/value_builder/unimarc_field_135a.pl
+++ b/cataloguing/value_builder/unimarc_field_135a.pl
@@ -57,7 +57,6 @@ my ($template, $loggedinuser, $cookie)
     = get_template_and_user({template_name => "cataloguing/value_builder/unimarc_field_135a.tt",
 			     query => $input,
 			     type => "intranet",
-			     authnotrequired => 0,
 			     flagsrequired => {editcatalogue => '*'},
 			     debug => 1,
 			     });
diff --git a/cataloguing/value_builder/unimarc_field_140.pl b/cataloguing/value_builder/unimarc_field_140.pl
index bcdb24481e..980dc0914e 100755
--- a/cataloguing/value_builder/unimarc_field_140.pl
+++ b/cataloguing/value_builder/unimarc_field_140.pl
@@ -58,7 +58,6 @@ my ($template, $loggedinuser, $cookie)
     = get_template_and_user({template_name => "cataloguing/value_builder/unimarc_field_140.tt",
 			     query => $input,
 			     type => "intranet",
-			     authnotrequired => 0,
 			     flagsrequired => {editcatalogue => '*'},
 			     debug => 1,
 			     });
diff --git a/cataloguing/value_builder/unimarc_field_141.pl b/cataloguing/value_builder/unimarc_field_141.pl
index c0658adccf..c8f36ceb40 100755
--- a/cataloguing/value_builder/unimarc_field_141.pl
+++ b/cataloguing/value_builder/unimarc_field_141.pl
@@ -54,7 +54,6 @@ my ($template, $loggedinuser, $cookie)
     = get_template_and_user({template_name => "cataloguing/value_builder/unimarc_field_141.tt",
 			     query => $input,
 			     type => "intranet",
-			     authnotrequired => 0,
 			     flagsrequired => {editcatalogue => '*'},
 			     debug => 1,
 			     });
diff --git a/cataloguing/value_builder/unimarc_field_210c.pl b/cataloguing/value_builder/unimarc_field_210c.pl
index f6602a0e1b..b512a595ce 100755
--- a/cataloguing/value_builder/unimarc_field_210c.pl
+++ b/cataloguing/value_builder/unimarc_field_210c.pl
@@ -94,7 +94,6 @@ my ($input) = @_;
             = get_template_and_user({template_name => "cataloguing/value_builder/unimarc_field_210c.tt",
                     query => $query,
                     type => 'intranet',
-                    authnotrequired => 0,
                     flagsrequired => {editcatalogue => '*'},
                     debug => 1,
                     });
@@ -125,7 +124,6 @@ my ($input) = @_;
             = get_template_and_user({template_name => "cataloguing/value_builder/unimarc_field_210c.tt",
                     query => $query,
                     type => 'intranet',
-                    authnotrequired => 0,
                     flagsrequired => {editcatalogue => '*'},
                     debug => 1,
                     });
diff --git a/cataloguing/value_builder/unimarc_field_210c_bis.pl b/cataloguing/value_builder/unimarc_field_210c_bis.pl
index e272ffd359..0c42e4dd11 100755
--- a/cataloguing/value_builder/unimarc_field_210c_bis.pl
+++ b/cataloguing/value_builder/unimarc_field_210c_bis.pl
@@ -74,7 +74,6 @@ sub plugin {
         {   template_name   => "cataloguing/value_builder/unimarc_field_210c_bis.tt",
             query           => $input,
             type            => "intranet",
-            authnotrequired => 0,
             flagsrequired   => { editcatalogue => '*' },
             debug           => 1,
         }
diff --git a/cataloguing/value_builder/unimarc_field_225a.pl b/cataloguing/value_builder/unimarc_field_225a.pl
index 0e0dca7dcd..b494f30e88 100755
--- a/cataloguing/value_builder/unimarc_field_225a.pl
+++ b/cataloguing/value_builder/unimarc_field_225a.pl
@@ -103,7 +103,6 @@ sub plugin {
               "cataloguing/value_builder/unimarc_field_225a.tt",
             query           => $input,
             type            => "intranet",
-            authnotrequired => 0,
             flagsrequired   => { editcatalogue => '*' },
             debug           => 1,
         }
diff --git a/cataloguing/value_builder/unimarc_field_225a_bis.pl b/cataloguing/value_builder/unimarc_field_225a_bis.pl
index 8bfa488d1b..b2a33bd4bd 100755
--- a/cataloguing/value_builder/unimarc_field_225a_bis.pl
+++ b/cataloguing/value_builder/unimarc_field_225a_bis.pl
@@ -52,7 +52,6 @@ sub plugin {
         template_name   => "cataloguing/value_builder/unimarc_field_225a_bis.tt",
         query           => $input,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { editcatalogue => '*' },
         debug           => 1,
     });
diff --git a/cataloguing/value_builder/unimarc_field_4XX.pl b/cataloguing/value_builder/unimarc_field_4XX.pl
index 5b95f14581..0e2e53b15a 100755
--- a/cataloguing/value_builder/unimarc_field_4XX.pl
+++ b/cataloguing/value_builder/unimarc_field_4XX.pl
@@ -89,7 +89,6 @@ sub plugin {
                   "cataloguing/value_builder/unimarc_field_4XX.tt",
                 query           => $query,
                 type            => "intranet",
-                authnotrequired => 0,
                 flagsrequired   => { editcatalogue => '*' },
                 debug           => 1,
             }
@@ -383,7 +382,6 @@ sub plugin {
                   "cataloguing/value_builder/unimarc_field_4XX.tt",
                 query           => $query,
                 type            => 'intranet',
-                authnotrequired => 0,
                 debug           => 1,
             }
         );
@@ -512,7 +510,6 @@ sub plugin {
                   "cataloguing/value_builder/unimarc_field_4XX.tt",
                 query           => $query,
                 type            => "intranet",
-                authnotrequired => 0,
             }
         );
 
diff --git a/cataloguing/value_builder/unimarc_field_686a.pl b/cataloguing/value_builder/unimarc_field_686a.pl
index 5eb79159c6..eefdccf171 100755
--- a/cataloguing/value_builder/unimarc_field_686a.pl
+++ b/cataloguing/value_builder/unimarc_field_686a.pl
@@ -56,7 +56,6 @@ my ($input) = @_;
             template_name   => "cataloguing/value_builder/unimarc_field_686a.tt",
             query           => $input,
             type            => "intranet",
-            authnotrequired => 0,
             flagsrequired   => { editcatalogue => '*' },
             debug           => 1,
         }
diff --git a/cataloguing/value_builder/unimarc_field_700-4.pl b/cataloguing/value_builder/unimarc_field_700-4.pl
index f86b49eb44..ea38515475 100755
--- a/cataloguing/value_builder/unimarc_field_700-4.pl
+++ b/cataloguing/value_builder/unimarc_field_700-4.pl
@@ -59,7 +59,6 @@ my ($input) = @_;
             template_name   => "cataloguing/value_builder/unimarc_field_700-4.tt",
             query           => $input,
             type            => "intranet",
-            authnotrequired => 0,
             flagsrequired   => { editcatalogue => '*' },
             debug           => 1,
         }
diff --git a/cataloguing/value_builder/unimarc_leader.pl b/cataloguing/value_builder/unimarc_leader.pl
index 72fdf50c2b..222bf84d01 100755
--- a/cataloguing/value_builder/unimarc_leader.pl
+++ b/cataloguing/value_builder/unimarc_leader.pl
@@ -64,7 +64,6 @@ sub plugin {
             template_name   => "cataloguing/value_builder/unimarc_leader.tt",
             query           => $input,
             type            => "intranet",
-            authnotrequired => 0,
             flagsrequired   => { editcatalogue => '*' },
             debug           => 1,
         }
diff --git a/circ/add_message.pl b/circ/add_message.pl
index 67a6844c43..e5d6d6687f 100755
--- a/circ/add_message.pl
+++ b/circ/add_message.pl
@@ -31,7 +31,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {   template_name   => "circ/circulation.tt",
         query           => $input,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { borrowers => 'edit_borrowers' },
         debug           => 1,
     }
diff --git a/circ/article-request-slip.pl b/circ/article-request-slip.pl
index 4330214c25..7e42380681 100755
--- a/circ/article-request-slip.pl
+++ b/circ/article-request-slip.pl
@@ -37,7 +37,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         template_name   => "circ/printslip.tt",
         query           => $cgi,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { circulate => "circulate_remaining_permissions" },
     }
 );
diff --git a/circ/article-requests.pl b/circ/article-requests.pl
index d0c2805250..888918dfca 100755
--- a/circ/article-requests.pl
+++ b/circ/article-requests.pl
@@ -31,7 +31,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         template_name   => "circ/article-requests.tt",
         query           => $query,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { circulate => "circulate_remaining_permissions" },
     }
 );
diff --git a/circ/bookcount.pl b/circ/bookcount.pl
index 0d869464cc..a415fca23e 100755
--- a/circ/bookcount.pl
+++ b/circ/bookcount.pl
@@ -45,7 +45,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         template_name   => "circ/bookcount.tt",
         query           => $input,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { circulate => "circulate_remaining_permissions" },
         debug           => 1,
     }
diff --git a/circ/branchoverdues.pl b/circ/branchoverdues.pl
index e696d77ed7..24c49cfddf 100755
--- a/circ/branchoverdues.pl
+++ b/circ/branchoverdues.pl
@@ -45,7 +45,6 @@ my ( $template, $loggedinuser, $cookie, $flags ) = get_template_and_user({
         template_name   => "circ/branchoverdues.tt",
         query           => $input,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { circulate => "circulate_remaining_permissions" },
         debug           => 1,
 });
diff --git a/circ/branchtransfers.pl b/circ/branchtransfers.pl
index 27f5a964a1..d2abc9147d 100755
--- a/circ/branchtransfers.pl
+++ b/circ/branchtransfers.pl
@@ -59,7 +59,6 @@ my ($template, $user, $cookie, $flags ) = get_template_and_user(
         template_name   => "circ/branchtransfers.tt",
         query           => $query,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { circulate => "circulate_remaining_permissions" },
     }
 );
diff --git a/circ/checkout-notes.pl b/circ/checkout-notes.pl
index 324d15e65b..dc891218ad 100755
--- a/circ/checkout-notes.pl
+++ b/circ/checkout-notes.pl
@@ -32,7 +32,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         template_name   => "circ/checkout-notes.tt",
         query           => $query,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { circulate => "manage_checkout_notes" },
     }
 );
diff --git a/circ/circulation-home.pl b/circ/circulation-home.pl
index 1d08a03f84..87be24610f 100755
--- a/circ/circulation-home.pl
+++ b/circ/circulation-home.pl
@@ -30,7 +30,6 @@ my ($template, $loggedinuser, $cookie, $flags) = get_template_and_user(
         template_name   => "circ/circulation-home.tt",
         query           => $query,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { circulate => "circulate_remaining_permissions" },
     }
 );
diff --git a/circ/circulation.pl b/circ/circulation.pl
index e854277f9a..1c22d497a0 100755
--- a/circ/circulation.pl
+++ b/circ/circulation.pl
@@ -138,7 +138,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user (
         template_name   => $template_name,
         query           => $query,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { circulate => 'circulate_remaining_permissions' },
     }
 );
diff --git a/circ/del_message.pl b/circ/del_message.pl
index 8889431943..36c25c3f2e 100755
--- a/circ/del_message.pl
+++ b/circ/del_message.pl
@@ -31,7 +31,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {   template_name   => "circ/circulation.tt",
         query           => $input,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { borrowers => 'edit_borrowers' },
         debug           => 1,
     }
diff --git a/circ/hold-transfer-slip.pl b/circ/hold-transfer-slip.pl
index a0cb0ef1ea..0cd57b1498 100755
--- a/circ/hold-transfer-slip.pl
+++ b/circ/hold-transfer-slip.pl
@@ -42,7 +42,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         template_name   => "circ/printslip.tt",
         query           => $input,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { circulate => "circulate_remaining_permissions" },
         debug           => $debug,
     }
diff --git a/circ/offline-mf.pl b/circ/offline-mf.pl
index 8cf93b17aa..b9d1c14678 100755
--- a/circ/offline-mf.pl
+++ b/circ/offline-mf.pl
@@ -27,7 +27,6 @@ my ( $template, $loggedinuser, $cookie, $flags ) = get_template_and_user(
         template_name   => "circ/offline-mf.tt",
         query           => $query,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { circulate => "circulate_remaining_permissions" },
     }
 );
diff --git a/circ/offline.pl b/circ/offline.pl
index b7757e214e..0c71646bd3 100755
--- a/circ/offline.pl
+++ b/circ/offline.pl
@@ -29,7 +29,6 @@ my ( $template, $loggedinuser, $cookie, $flags ) = get_template_and_user(
         template_name   => "circ/offline.tt",
         query           => $query,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { circulate => "circulate_remaining_permissions" },
     }
 );
diff --git a/circ/on-site_checkouts.pl b/circ/on-site_checkouts.pl
index 96cea5a66f..6118a56b69 100755
--- a/circ/on-site_checkouts.pl
+++ b/circ/on-site_checkouts.pl
@@ -31,7 +31,6 @@ my ( $template, $loggedinuser, $cookie, $flags ) = get_template_and_user(
         template_name   => "circ/on-site_checkouts.tt",
         query           => $cgi,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired => {circulate => "circulate_remaining_permissions"},
     }
 );
diff --git a/circ/overdue.pl b/circ/overdue.pl
index 7eb6d08a21..53a2a406b0 100755
--- a/circ/overdue.pl
+++ b/circ/overdue.pl
@@ -71,7 +71,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         template_name   => "circ/overdue.tt",
         query           => $input,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { circulate => "overdues_report" },
         debug           => 1,
     }
diff --git a/circ/pendingreserves.pl b/circ/pendingreserves.pl
index 551ea127df..8ea8d25fde 100755
--- a/circ/pendingreserves.pl
+++ b/circ/pendingreserves.pl
@@ -46,7 +46,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         template_name   => "circ/pendingreserves.tt",
         query           => $input,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { circulate => "circulate_remaining_permissions" },
         debug           => 1,
     }
diff --git a/circ/renew.pl b/circ/renew.pl
index df1e043bdb..01ca12a224 100755
--- a/circ/renew.pl
+++ b/circ/renew.pl
@@ -36,7 +36,6 @@ my ( $template, $librarian, $cookie, $flags ) = get_template_and_user(
         template_name   => "circ/renew.tt",
         query           => $cgi,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { circulate => "circulate_remaining_permissions" },
     }
 );
diff --git a/circ/request-article.pl b/circ/request-article.pl
index 7c0877bff8..66d042b4e5 100755
--- a/circ/request-article.pl
+++ b/circ/request-article.pl
@@ -35,7 +35,6 @@ my ( $template, $borrowernumber, $cookie, $flags ) = get_template_and_user(
         template_name   => "circ/request-article.tt",
         query           => $cgi,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { circulate => 'circulate_remaining_permissions' },
     }
 );
diff --git a/circ/reserveratios.pl b/circ/reserveratios.pl
index b4b0b81229..a1c5cd74cf 100755
--- a/circ/reserveratios.pl
+++ b/circ/reserveratios.pl
@@ -43,7 +43,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         template_name   => "circ/reserveratios.tt",
         query           => $input,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { circulate => "circulate_remaining_permissions" },
         debug           => 1,
     }
diff --git a/circ/returns.pl b/circ/returns.pl
index 557fadc274..f3fd254ef4 100755
--- a/circ/returns.pl
+++ b/circ/returns.pl
@@ -63,7 +63,6 @@ my ( $template, $librarian, $cookie, $flags ) = get_template_and_user(
         template_name   => "circ/returns.tt",
         query           => $query,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { circulate => "circulate_remaining_permissions" },
     }
 );
diff --git a/circ/selectbranchprinter.pl b/circ/selectbranchprinter.pl
index 0febd0ffb7..2401ae57dd 100755
--- a/circ/selectbranchprinter.pl
+++ b/circ/selectbranchprinter.pl
@@ -37,7 +37,6 @@ my ( $template, $borrowernumber, $cookie, $flags ) = get_template_and_user({
     query           => $query,
     type            => "intranet",
     debug           => 1,
-    authnotrequired => 0,
     flagsrequired   => { catalogue => 1, },
 });
 
diff --git a/circ/transfer-slip.pl b/circ/transfer-slip.pl
index 8ffbeaae72..eb762535e2 100755
--- a/circ/transfer-slip.pl
+++ b/circ/transfer-slip.pl
@@ -45,7 +45,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         template_name   => "circ/printslip.tt",
         query           => $input,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { circulate => "circulate_remaining_permissions" },
         debug           => $debug,
     }
diff --git a/circ/transferstoreceive.pl b/circ/transferstoreceive.pl
index b9123f6c01..37ae2a473c 100755
--- a/circ/transferstoreceive.pl
+++ b/circ/transferstoreceive.pl
@@ -49,7 +49,6 @@ my ( $template, $loggedinuser, $cookie, $flags ) = get_template_and_user(
         template_name   => "circ/transferstoreceive.tt",
         query           => $input,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { circulate => "circulate_remaining_permissions" },
         debug           => 1,
     }
diff --git a/circ/view_holdsqueue.pl b/circ/view_holdsqueue.pl
index f7dbbc23c6..26c04fe78f 100755
--- a/circ/view_holdsqueue.pl
+++ b/circ/view_holdsqueue.pl
@@ -38,7 +38,6 @@ my ( $template, $loggedinuser, $cookie, $flags ) = get_template_and_user(
         template_name   => "circ/view_holdsqueue.tt",
         query           => $query,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { circulate => "circulate_remaining_permissions" },
         debug           => 1,
     }
diff --git a/circ/waitingreserves.pl b/circ/waitingreserves.pl
index c78884f70e..0618820ba8 100755
--- a/circ/waitingreserves.pl
+++ b/circ/waitingreserves.pl
@@ -55,7 +55,6 @@ my ( $template, $loggedinuser, $cookie, $flags ) = get_template_and_user(
         template_name   => "circ/waitingreserves.tt",
         query           => $input,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { circulate => "circulate_remaining_permissions" },
         debug           => 1,
     }
diff --git a/clubs/club-enrollments.pl b/clubs/club-enrollments.pl
index 01ef24d19f..87b8debfa0 100755
--- a/clubs/club-enrollments.pl
+++ b/clubs/club-enrollments.pl
@@ -32,7 +32,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         template_name   => 'clubs/club-enrollments.tt',
         query           => $cgi,
         type            => 'intranet',
-        authnotrequired => 0,
         flagsrequired   => { clubs => 'edit_clubs' },
     }
 );
diff --git a/clubs/clubs-add-modify.pl b/clubs/clubs-add-modify.pl
index dabac245fa..0337cf02bb 100755
--- a/clubs/clubs-add-modify.pl
+++ b/clubs/clubs-add-modify.pl
@@ -35,7 +35,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         template_name   => 'clubs/clubs-add-modify.tt',
         query           => $cgi,
         type            => 'intranet',
-        authnotrequired => 0,
         flagsrequired   => { clubs => 'edit_clubs' },
     }
 );
diff --git a/clubs/clubs.pl b/clubs/clubs.pl
index 4429e236a8..ca382ce414 100755
--- a/clubs/clubs.pl
+++ b/clubs/clubs.pl
@@ -34,7 +34,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         template_name   => "clubs/clubs.tt",
         query           => $cgi,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { clubs => '*' },
     }
 );
diff --git a/clubs/patron-clubs-tab.pl b/clubs/patron-clubs-tab.pl
index f50da65a5a..7a770bdfbb 100755
--- a/clubs/patron-clubs-tab.pl
+++ b/clubs/patron-clubs-tab.pl
@@ -34,7 +34,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         template_name   => "clubs/patron-clubs-tab.tt",
         query           => $cgi,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { clubs => '*' },
     }
 );
diff --git a/clubs/patron-enroll.pl b/clubs/patron-enroll.pl
index bc836277af..7dc5bed25a 100755
--- a/clubs/patron-enroll.pl
+++ b/clubs/patron-enroll.pl
@@ -32,7 +32,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         template_name   => "clubs/patron-enroll.tt",
         query           => $cgi,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { clubs => '*' },
     }
 );
diff --git a/clubs/templates-add-modify.pl b/clubs/templates-add-modify.pl
index 254a99e219..f6b58ed0b0 100755
--- a/clubs/templates-add-modify.pl
+++ b/clubs/templates-add-modify.pl
@@ -39,7 +39,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         template_name   => 'clubs/templates-add-modify.tt',
         query           => $cgi,
         type            => 'intranet',
-        authnotrequired => 0,
         flagsrequired   => { clubs => 'edit_templates' },
     }
 );
diff --git a/course_reserves/add_items.pl b/course_reserves/add_items.pl
index 0819e4787f..ea67262ad2 100755
--- a/course_reserves/add_items.pl
+++ b/course_reserves/add_items.pl
@@ -54,7 +54,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {   template_name   => "course_reserves/$tmpl",
         query           => $cgi,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { coursereserves => 'add_reserves' },
     }
 );
diff --git a/course_reserves/batch_add_items.pl b/course_reserves/batch_add_items.pl
index 76d0caa0b5..2a672e71c7 100755
--- a/course_reserves/batch_add_items.pl
+++ b/course_reserves/batch_add_items.pl
@@ -47,7 +47,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         template_name   => "course_reserves/batch_add_items.tt",
         query           => $cgi,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { coursereserves => 'add_reserves' },
     }
 );
diff --git a/course_reserves/course-details.pl b/course_reserves/course-details.pl
index af1eb62337..cd8e18aa78 100755
--- a/course_reserves/course-details.pl
+++ b/course_reserves/course-details.pl
@@ -41,7 +41,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {   template_name   => "course_reserves/$tmpl",
         query           => $cgi,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => $flagsrequired,
     }
 );
diff --git a/course_reserves/course-reserves.pl b/course_reserves/course-reserves.pl
index 0a07d4f419..d8052e0658 100755
--- a/course_reserves/course-reserves.pl
+++ b/course_reserves/course-reserves.pl
@@ -34,7 +34,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         template_name   => "course_reserves/course-reserves.tt",
         query           => $cgi,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { catalogue => 1 },
     }
 );
diff --git a/course_reserves/course.pl b/course_reserves/course.pl
index 5a87cdae94..d655bf1542 100755
--- a/course_reserves/course.pl
+++ b/course_reserves/course.pl
@@ -34,7 +34,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {   template_name   => "course_reserves/course.tt",
         query           => $cgi,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { coursereserves => 'manage_courses' },
     }
 );
diff --git a/course_reserves/mod_course.pl b/course_reserves/mod_course.pl
index cef6988e88..b7b2943239 100755
--- a/course_reserves/mod_course.pl
+++ b/course_reserves/mod_course.pl
@@ -32,7 +32,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {   template_name   => "about.tt",
         query           => $cgi,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { coursereserves => 'manage_courses' },
     }
 );
diff --git a/installer/html-template-to-template-toolkit.pl b/installer/html-template-to-template-toolkit.pl
index 60cd951dd1..2b9084b4b2 100755
--- a/installer/html-template-to-template-toolkit.pl
+++ b/installer/html-template-to-template-toolkit.pl
@@ -27,12 +27,12 @@ my $tmpl_in_dir      = 'koha-tmpl';
 my $tmpl_out_dir     = 'koha-tt';
 
 # template toolkit variables NOT to scope, in other words, variables that need to remain global (case sensitive)
-my @globals = ("themelang","JacketImages","OPACAmazonCoverImages","GoogleJackets","BakerTaylorEnabled",
-"SyndeticsEnabled", "OpacRenewalAllowed", "item_level_itypes","noItemTypeImages",
-"virtualshelves", "RequestOnOpac", "COinSinOPACResults", "OPACXSLTResultsDisplay",
-"OPACItemsResultsDisplay", "LibraryThingForLibrariesID", "opacuserlogin", "TagsEnabled",
-"TagsShowOnList", "TagsInputOnList","loggedinusername","opacbookbag",
-"OPACAmazonEnabled", "SyndeticsCoverImages","using_https");
+my @globals = ( "themelang","JacketImages","OPACAmazonCoverImages","GoogleJackets","BakerTaylorEnabled",
+    "SyndeticsEnabled", "OpacRenewalAllowed", "item_level_itypes","noItemTypeImages",
+    "virtualshelves", "RequestOnOpac", "COinSinOPACResults", "OPACXSLTResultsDisplay",
+    "OPACItemsResultsDisplay", "LibraryThingForLibrariesID", "opacuserlogin", "TagsEnabled",
+    "TagsShowOnList", "TagsInputOnList","loggedinusername","opacbookbag",
+    "OPACAmazonEnabled", "SyndeticsCoverImages" );
 
 # Arguments:
 my $KOHA_ROOT;
diff --git a/installer/install.pl b/installer/install.pl
index 829a43ebb8..7132d4b70f 100755
--- a/installer/install.pl
+++ b/installer/install.pl
@@ -48,7 +48,6 @@ if ( defined($language) ) {
         template_name => "installer/step" . ( $step ? $step : 1 ) . ".tt",
         query         => $query,
         type          => "intranet",
-        authnotrequired => 0,
         debug           => 1,
     }
 );
diff --git a/installer/onboarding.pl b/installer/onboarding.pl
index 77aa12018a..c8b2495213 100755
--- a/installer/onboarding.pl
+++ b/installer/onboarding.pl
@@ -305,7 +305,6 @@ my ( $template, $loggedinuser );
         template_name   => "onboarding/onboardingstep${step}.tt",
         query           => $input,
         type            => "intranet",
-        authnotrequired => 0,
         debug           => 1,
     }
 );
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
index 19b9c2d2a0..38eada710f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
@@ -602,7 +602,11 @@
                     <label for="email">
                 [% END %]
                 Primary email: </label>
+                [% IF ( NoUpdateEmail ) %]
+                <input type="text" id="email" name="email" size="45" value="[% patron.email | html %]" disabled="disabled" />
+                [% ELSE %]
                 <input type="text" id="email" name="email" size="45" value="[% patron.email | html %]" />
+                [% END %]
                 [% IF ( mandatoryemail ) %]<span class="required">Required</span>[% END %]<div class="hint">Shows on transit slips</div>
             </li>
         [% END %]
@@ -615,7 +619,11 @@
                     <label for="emailpro">
                 [% END %]
                 Secondary email: </label>
+                [% IF ( NoUpdateEmail ) %]
+                <input type="text" id="emailpro" name="emailpro" size="45" value="[% patron.emailpro | html %]" disabled="disabled" />
+                [% ELSE %]
                 <input type="text" id="emailpro" name="emailpro" size="45" value="[% patron.emailpro | html %]" />
+                [% END %]
                 [% IF ( mandatoryemailpro ) %]<span class="required">Required</span>[% END %]
             </li>
         [% END %]
diff --git a/labels/label-create-pdf.pl b/labels/label-create-pdf.pl
index edff024bc1..76afef3378 100755
--- a/labels/label-create-pdf.pl
+++ b/labels/label-create-pdf.pl
@@ -32,7 +32,6 @@ my ( undef, $loggedinuser, $cookie ) = get_template_and_user({
 								     template_name   => "labels/label-home.tt",
 								     query           => $cgi,
 								     type            => "intranet",
-								     authnotrequired => 0,
 								     flagsrequired   => { tools => 'label_creator' },
 								     debug           => 1,
 								     });
diff --git a/labels/label-edit-batch.pl b/labels/label-edit-batch.pl
index 83c74e9c25..7df5ff11ea 100755
--- a/labels/label-edit-batch.pl
+++ b/labels/label-edit-batch.pl
@@ -36,7 +36,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         template_name   => "labels/label-edit-batch.tt",
         query           => $cgi,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { catalogue => 1 },
         debug           => 1,
     }
diff --git a/labels/label-edit-layout.pl b/labels/label-edit-layout.pl
index e14135abb2..ac907f3bea 100755
--- a/labels/label-edit-layout.pl
+++ b/labels/label-edit-layout.pl
@@ -34,7 +34,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         template_name   => "labels/label-edit-layout.tt",
         query           => $cgi,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { catalogue => 1 },
         debug           => 1,
     }
diff --git a/labels/label-edit-profile.pl b/labels/label-edit-profile.pl
index 07e34caf1d..6a60c6c7f4 100755
--- a/labels/label-edit-profile.pl
+++ b/labels/label-edit-profile.pl
@@ -33,7 +33,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         template_name   => "labels/label-edit-profile.tt",
         query           => $cgi,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { catalogue => 1 },
         debug           => 1,
     }
diff --git a/labels/label-edit-template.pl b/labels/label-edit-template.pl
index d4afc5eede..6beb0b4cc4 100755
--- a/labels/label-edit-template.pl
+++ b/labels/label-edit-template.pl
@@ -33,7 +33,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         template_name   => "labels/label-edit-template.tt",
         query           => $cgi,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { catalogue => 1 },
         debug           => 1,
     }
diff --git a/labels/label-home.pl b/labels/label-home.pl
index b5b361ca5c..245f22fa85 100755
--- a/labels/label-home.pl
+++ b/labels/label-home.pl
@@ -31,7 +31,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         template_name   => "labels/label-home.tt",
         query           => $cgi,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { catalogue => 1 },
         debug           => 1,
     }
diff --git a/labels/label-item-search.pl b/labels/label-item-search.pl
index 5b202245de..dffff20a33 100755
--- a/labels/label-item-search.pl
+++ b/labels/label-item-search.pl
@@ -159,7 +159,6 @@ if ($show_results) {
             template_name   => "labels/result.tt",
             query           => $query,
             type            => "intranet",
-            authnotrequired => 0,
             flagsrequired   => { borrowers => 'edit_borrowers' },
             flagsrequired   => { catalogue => 1 },
             debug           => 1,
@@ -239,7 +238,6 @@ else {
             template_name   => "labels/search.tt",
             query           => $query,
             type            => "intranet",
-            authnotrequired => 0,
             flagsrequired   => { catalogue => 1 },
             debug           => 1,
         }
diff --git a/labels/label-manage.pl b/labels/label-manage.pl
index 762b6a25a9..eca571d6f0 100755
--- a/labels/label-manage.pl
+++ b/labels/label-manage.pl
@@ -36,7 +36,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         template_name   => "labels/label-manage.tt",
         query           => $cgi,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { catalogue => 1 },
         debug           => 1,
     }
diff --git a/labels/label-print.pl b/labels/label-print.pl
index e8a42fa206..db677d0e8b 100755
--- a/labels/label-print.pl
+++ b/labels/label-print.pl
@@ -33,7 +33,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         template_name   => "labels/label-print.tt",
         query           => $cgi,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { catalogue => 1 },
         debug           => 1,
     }
diff --git a/labels/spinelabel-home.pl b/labels/spinelabel-home.pl
index dcb9d12c88..defd2ef03e 100755
--- a/labels/spinelabel-home.pl
+++ b/labels/spinelabel-home.pl
@@ -28,7 +28,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {   template_name   => "labels/spinelabel-home.tt",
         query           => $query,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { catalogue => 1 },
         debug           => 1,
     }
diff --git a/labels/spinelabel-print.pl b/labels/spinelabel-print.pl
index d1e81ea14b..55c26bed37 100755
--- a/labels/spinelabel-print.pl
+++ b/labels/spinelabel-print.pl
@@ -26,7 +26,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {   template_name   => "labels/spinelabel-print.tt",
         query           => $query,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { catalogue => 1 },
         debug           => 1,
     }
diff --git a/mainpage.pl b/mainpage.pl
index 49f46fc272..6bd451a420 100755
--- a/mainpage.pl
+++ b/mainpage.pl
@@ -39,7 +39,6 @@ my ( $template, $loggedinuser, $cookie, $flags ) = get_template_and_user(
         template_name   => "intranet-main.tt",
         query           => $query,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { catalogue => 1, },
     }
 );
diff --git a/members/accountline-details.pl b/members/accountline-details.pl
index 1ac40a0210..5e0b82da3a 100755
--- a/members/accountline-details.pl
+++ b/members/accountline-details.pl
@@ -33,7 +33,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         template_name   => "members/accountline-details.tt",
         query           => $input,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => {
             borrowers     => 'edit_borrowers',
             updatecharges => 'remaining_permissions'
diff --git a/members/apikeys.pl b/members/apikeys.pl
index ffbd40d329..619fc30b8a 100755
--- a/members/apikeys.pl
+++ b/members/apikeys.pl
@@ -34,7 +34,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {   template_name   => 'members/apikeys.tt',
         query           => $cgi,
         type            => 'intranet',
-        authnotrequired => 0,
         flagsrequired   => { borrowers => 'edit_borrowers' },
     }
 );
diff --git a/members/boraccount.pl b/members/boraccount.pl
index 251a3aa565..5b4d8a9396 100755
--- a/members/boraccount.pl
+++ b/members/boraccount.pl
@@ -40,7 +40,6 @@ my ($template, $loggedinuser, $cookie) = get_template_and_user(
         template_name   => "members/boraccount.tt",
         query           => $input,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { borrowers     => 'edit_borrowers',
                              updatecharges => 'remaining_permissions'},
         debug           => 1,
diff --git a/members/deletemem.pl b/members/deletemem.pl
index 5434cdfe53..bb49230ffc 100755
--- a/members/deletemem.pl
+++ b/members/deletemem.pl
@@ -38,7 +38,6 @@ my ($template, $loggedinuser, $cookie)
                 = get_template_and_user({template_name => "members/deletemem.tt",
                                         query => $input,
                                         type => "intranet",
-                                        authnotrequired => 0,
                                         flagsrequired => {borrowers => 'edit_borrowers'},
                                         debug => 1,
                                         });
diff --git a/members/discharge.pl b/members/discharge.pl
index 9e530bfcc1..3e22db4026 100755
--- a/members/discharge.pl
+++ b/members/discharge.pl
@@ -47,7 +47,6 @@ my ( $template, $loggedinuser, $cookie, $flags ) = get_template_and_user({
     template_name   => 'members/discharge.tt',
     query           => $input,
     type            => 'intranet',
-    authnotrequired => 0,
     flagsrequired   => { 'borrowers' => 'edit_borrowers' },
 });
 
diff --git a/members/discharges.pl b/members/discharges.pl
index 665d2732be..008b073bcb 100755
--- a/members/discharges.pl
+++ b/members/discharges.pl
@@ -32,7 +32,6 @@ my ( $template, $loggedinuser, $cookie, $flags ) = get_template_and_user({
     template_name   => "members/discharges.tt",
     query           => $input,
     type            => "intranet",
-    authnotrequired => 0,
     flagsrequired   => { borrowers => 'edit_borrowers' },
 });
 
diff --git a/members/files.pl b/members/files.pl
index 0bd4f94e65..e4c13b5f4b 100755
--- a/members/files.pl
+++ b/members/files.pl
@@ -38,7 +38,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         template_name   => "members/files.tt",
         query           => $cgi,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { borrowers => 'edit_borrowers' },
         debug           => 1,
     }
diff --git a/members/guarantor_search.pl b/members/guarantor_search.pl
index 0287047740..6b03a92565 100755
--- a/members/guarantor_search.pl
+++ b/members/guarantor_search.pl
@@ -34,7 +34,6 @@ my ( $template, $loggedinuser, $cookie, $staff_flags ) = get_template_and_user(
     {   template_name   => "common/patron_search.tt",
         query           => $input,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { borrowers => 'edit_borrowers' },
     }
 );
diff --git a/members/holdshistory.pl b/members/holdshistory.pl
index d0d96e0c27..2b2db160d2 100755
--- a/members/holdshistory.pl
+++ b/members/holdshistory.pl
@@ -33,7 +33,6 @@ my @all_holds;
 my ($template, $loggedinuser, $cookie)= get_template_and_user({template_name => "members/holdshistory.tt",
                 query => $input,
                 type => "intranet",
-                authnotrequired => 0,
                 flagsrequired => {borrowers => 'edit_borrowers'},
                 debug => 1,
                 });
diff --git a/members/housebound.pl b/members/housebound.pl
index 4b965d8ede..3a748d10d5 100755
--- a/members/housebound.pl
+++ b/members/housebound.pl
@@ -45,7 +45,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         template_name   => 'members/housebound.tt',
         query           => $input,
         type            => 'intranet',
-        authnotrequired => 0,
         flagsrequired   => { borrowers => 'edit_borrowers' },
     }
 );
diff --git a/members/ill-requests.pl b/members/ill-requests.pl
index cb02c73eee..59c58543ba 100755
--- a/members/ill-requests.pl
+++ b/members/ill-requests.pl
@@ -31,7 +31,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         template_name   => "members/ill-requests.tt",
         query           => $input,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { borrowers => 'edit_borrowers' },
         debug           => 1,
     }
diff --git a/members/mancredit.pl b/members/mancredit.pl
index b3c560d6d5..efbfb52cae 100755
--- a/members/mancredit.pl
+++ b/members/mancredit.pl
@@ -44,7 +44,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         template_name   => "members/mancredit.tt",
         query           => $input,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => {
             borrowers     => 'edit_borrowers',
             updatecharges => 'remaining_permissions'
diff --git a/members/maninvoice.pl b/members/maninvoice.pl
index a54206fb74..c3afa756d6 100755
--- a/members/maninvoice.pl
+++ b/members/maninvoice.pl
@@ -44,7 +44,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         template_name   => "members/maninvoice.tt",
         query           => $input,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => {
             borrowers     => 'edit_borrowers',
             updatecharges => 'remaining_permissions'
diff --git a/members/member-flags.pl b/members/member-flags.pl
index f493a0605c..d55b626374 100755
--- a/members/member-flags.pl
+++ b/members/member-flags.pl
@@ -38,7 +38,6 @@ my ($template, $loggedinuser, $cookie) = get_template_and_user({
         template_name   => "members/member-flags.tt",
         query           => $input,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => $flagsrequired,
         debug           => 1,
 });
diff --git a/members/member-password.pl b/members/member-password.pl
index c1db3aab23..0d7c3c7b53 100755
--- a/members/member-password.pl
+++ b/members/member-password.pl
@@ -32,7 +32,6 @@ my ( $template, $loggedinuser, $cookie, $staffflags ) = get_template_and_user(
         template_name   => "members/member-password.tt",
         query           => $input,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { borrowers => 'edit_borrowers' },
         debug           => 1,
     }
diff --git a/members/member.pl b/members/member.pl
index 11cbc41a32..d31f43aac2 100755
--- a/members/member.pl
+++ b/members/member.pl
@@ -37,7 +37,6 @@ my ($template, $loggedinuser, $cookie)
     = get_template_and_user({template_name => "members/member.tt",
                  query => $input,
                  type => "intranet",
-                 authnotrequired => 0,
                  flagsrequired => {borrowers => 'edit_borrowers'},
                  });
 
diff --git a/members/memberentry.pl b/members/memberentry.pl
index 488c4e70aa..4dd3bfd052 100755
--- a/members/memberentry.pl
+++ b/members/memberentry.pl
@@ -66,7 +66,6 @@ my ($template, $loggedinuser, $cookie)
     = get_template_and_user({template_name => "members/memberentrygen.tt",
            query => $input,
            type => "intranet",
-           authnotrequired => 0,
            flagsrequired => {borrowers => 'edit_borrowers'},
            debug => ($debug) ? 1 : 0,
        });
@@ -102,6 +101,7 @@ my $step          = $input->param('step') || 0;
 my @errors;
 my $borrower_data;
 my $NoUpdateLogin;
+my $NoUpdateEmail;
 my $userenv = C4::Context->userenv;
 my @messages;
 
@@ -167,6 +167,11 @@ if ( $op eq 'modify' or $op eq 'save' or $op eq 'duplicate' ) {
     my $logged_in_user = Koha::Patrons->find( $loggedinuser ) or die "Not logged in";
     output_and_exit_if_error( $input, $cookie, $template, { module => 'members', logged_in_user => $logged_in_user, current_patron => $patron } );
 
+    # check permission to modify email info.
+    if ( $patron->is_superlibrarian && !$logged_in_user->is_superlibrarian ) {
+        $NoUpdateEmail = 1;
+    }
+
     $borrower_data = $patron->unblessed;
     $borrower_data->{category_type} = $patron->category->category_type;
 }
@@ -207,7 +212,8 @@ if ( $op eq 'insert' || $op eq 'modify' || $op eq 'save' || $op eq 'duplicate' )
             push(@errors,"ERROR_$_");
         }
     }
-  # check permission to modify login info.
+
+    # check permission to modify login info.
     if (ref($borrower_data) && ($borrower_data->{'category_type'} eq 'S') && ! (C4::Auth::haspermission($userenv->{'id'},{'staffaccess'=>1})) )  {
         $NoUpdateLogin = 1;
     }
@@ -513,6 +519,13 @@ if ((!$nok) and $nodouble and ($op eq 'insert' or $op eq 'save')){
         }
 
         my $patron = Koha::Patrons->find( $borrowernumber );
+
+        if ($NoUpdateEmail) {
+            delete $newdata{'email'};
+            delete $newdata{'emailpro'};
+            delete $newdata{'B_email'};
+        }
+
         $newdata{debarredcomment} = $newdata{debarred_comment};
         delete $newdata{debarred_comment};
         delete $newdata{password2};
@@ -826,6 +839,7 @@ $template->param(
   modify          => $modify,
   nok     => $nok,#flag to know if an error
   NoUpdateLogin =>  $NoUpdateLogin,
+  NoUpdateEmail =>  $NoUpdateEmail,
   );
 
 # Generate CSRF token
diff --git a/members/members-home.pl b/members/members-home.pl
index 73a370dc81..a5ad3e1657 100755
--- a/members/members-home.pl
+++ b/members/members-home.pl
@@ -34,7 +34,6 @@ my ($template, $loggedinuser, $cookie, $flags)
     = get_template_and_user({template_name => "members/member.tt",
                  query => $query,
                  type => "intranet",
-                 authnotrequired => 0,
                  flagsrequired => {borrowers => 'edit_borrowers'},
                  debug => 1,
                  });
diff --git a/members/members-update-do.pl b/members/members-update-do.pl
index cc29dbe6ad..9e35f3027a 100755
--- a/members/members-update-do.pl
+++ b/members/members-update-do.pl
@@ -33,7 +33,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         template_name   => "about.tt",
         query           => $query,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { borrowers => 'edit_borrowers' },
         debug           => 1,
     }
diff --git a/members/members-update.pl b/members/members-update.pl
index 84019f4e20..650056c9c7 100755
--- a/members/members-update.pl
+++ b/members/members-update.pl
@@ -37,7 +37,6 @@ my ( $template, $loggedinuser, $cookie, $flags ) = get_template_and_user(
     {   template_name   => "members/members-update.tt",
         query           => $query,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { borrowers => 'edit_borrowers' },
         debug           => 1,
     }
diff --git a/members/merge-patrons.pl b/members/merge-patrons.pl
index b4ea721a10..0d1d17afcb 100755
--- a/members/merge-patrons.pl
+++ b/members/merge-patrons.pl
@@ -33,7 +33,6 @@ my ( $template, $loggedinuser, $cookie, $flags ) = get_template_and_user(
         template_name   => "members/merge-patrons.tt",
         query           => $cgi,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { borrowers => 'edit_borrowers' },
     }
 );
diff --git a/members/moremember.pl b/members/moremember.pl
index a2ba396020..f6a5da37a4 100755
--- a/members/moremember.pl
+++ b/members/moremember.pl
@@ -69,7 +69,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         template_name   => $template_name,
         query           => $input,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { borrowers => 'edit_borrowers' },
         debug           => 1,
     }
diff --git a/members/notices.pl b/members/notices.pl
index 3a7068336a..4853c22a56 100755
--- a/members/notices.pl
+++ b/members/notices.pl
@@ -42,7 +42,6 @@ my $borrower = $patron->unblessed;
 my ($template, $loggedinuser, $cookie)= get_template_and_user({template_name => "members/notices.tt",
 				query => $input,
 				type => "intranet",
-				authnotrequired => 0,
                 flagsrequired => {borrowers => 'edit_borrowers'},
 				debug => 1,
 				});
diff --git a/members/pay.pl b/members/pay.pl
index 88ac7689a3..fcf91889c5 100755
--- a/members/pay.pl
+++ b/members/pay.pl
@@ -50,7 +50,6 @@ our ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {   template_name   => 'members/pay.tt',
         query           => $input,
         type            => 'intranet',
-        authnotrequired => 0,
         flagsrequired   => { borrowers => 'edit_borrowers', updatecharges => $updatecharges_permissions },
         debug           => 1,
     }
diff --git a/members/paycollect.pl b/members/paycollect.pl
index b945d91587..da87507aad 100755
--- a/members/paycollect.pl
+++ b/members/paycollect.pl
@@ -47,7 +47,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {   template_name   => 'members/paycollect.tt',
         query           => $input,
         type            => 'intranet',
-        authnotrequired => 0,
         flagsrequired   => { borrowers => 'edit_borrowers', updatecharges => $updatecharges_permissions },
         debug           => 1,
     }
diff --git a/members/print_overdues.pl b/members/print_overdues.pl
index 4fd9c389e2..f61c9f457a 100755
--- a/members/print_overdues.pl
+++ b/members/print_overdues.pl
@@ -37,7 +37,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         template_name   => "circ/printslip.tt",
         query           => $input,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => $flagsrequired,
         debug           => 1,
     }
diff --git a/members/printfeercpt.pl b/members/printfeercpt.pl
index 1d92e19b07..7ae4e5d99d 100755
--- a/members/printfeercpt.pl
+++ b/members/printfeercpt.pl
@@ -42,7 +42,6 @@ my ($template, $loggedinuser, $cookie)
     = get_template_and_user({template_name => "members/printfeercpt.tt",
                             query => $input,
                             type => "intranet",
-                            authnotrequired => 0,
                             flagsrequired => {borrowers => 'edit_borrowers', updatecharges => 'remaining_permissions'},
                             debug => 1,
                             });
diff --git a/members/printinvoice.pl b/members/printinvoice.pl
index e3b0e39c51..a789b8cca6 100755
--- a/members/printinvoice.pl
+++ b/members/printinvoice.pl
@@ -39,7 +39,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {   template_name   => "members/printinvoice.tt",
         query           => $input,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired => { borrowers => 'edit_borrowers', updatecharges => 'remaining_permissions' },
         debug           => 1,
     }
diff --git a/members/printslip.pl b/members/printslip.pl
index a3d2d50031..dc9e91a8ca 100755
--- a/members/printslip.pl
+++ b/members/printslip.pl
@@ -66,7 +66,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         template_name   => "circ/printslip.tt",
         query           => $input,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => $flagsrequired,
         debug           => 1,
     }
diff --git a/members/purchase-suggestions.pl b/members/purchase-suggestions.pl
index 5477b23c0f..06e8c56304 100755
--- a/members/purchase-suggestions.pl
+++ b/members/purchase-suggestions.pl
@@ -33,7 +33,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {   template_name   => "members/purchase-suggestions.tt",
         query           => $input,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { suggestions => 'suggestions_manage' },
         debug           => 1,
     }
diff --git a/members/readingrec.pl b/members/readingrec.pl
index 7dd71f8fce..04a02ff82b 100755
--- a/members/readingrec.pl
+++ b/members/readingrec.pl
@@ -38,7 +38,6 @@ my $input = CGI->new;
 my ($template, $loggedinuser, $cookie)= get_template_and_user({template_name => "members/readingrec.tt",
 				query => $input,
 				type => "intranet",
-				authnotrequired => 0,
                 flagsrequired => {borrowers => 'edit_borrowers'},
 				debug => 1,
 				});
diff --git a/members/routing-lists.pl b/members/routing-lists.pl
index 4885b1405e..40639a9ef3 100755
--- a/members/routing-lists.pl
+++ b/members/routing-lists.pl
@@ -34,7 +34,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user (
         template_name   => 'members/routing-lists.tt',
         query           => $query,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { circulate => 'circulate_remaining_permissions' },
     }
 );
diff --git a/members/statistics.pl b/members/statistics.pl
index ba453453c6..760eb0dd9b 100755
--- a/members/statistics.pl
+++ b/members/statistics.pl
@@ -39,7 +39,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {   template_name   => "members/statistics.tt",
         query           => $input,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { borrowers => 'edit_borrowers' },
         debug           => 1,
     }
diff --git a/members/summary-print.pl b/members/summary-print.pl
index a0fee06c59..ebabf4e35f 100755
--- a/members/summary-print.pl
+++ b/members/summary-print.pl
@@ -38,7 +38,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         template_name   => "members/moremember-print.tt",
         query           => $input,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { circulate => "circulate_remaining_permissions" },
         debug           => 1,
     }
diff --git a/members/update-child.pl b/members/update-child.pl
index 60d239a76c..d6c25b0e09 100755
--- a/members/update-child.pl
+++ b/members/update-child.pl
@@ -45,7 +45,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         template_name   => "members/update-child.tt",
         query           => $input,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { borrowers => 'edit_borrowers' },
         debug           => 1,
     }
diff --git a/offline_circ/enqueue_koc.pl b/offline_circ/enqueue_koc.pl
index 0f32352a7f..7ca5699f2e 100755
--- a/offline_circ/enqueue_koc.pl
+++ b/offline_circ/enqueue_koc.pl
@@ -49,7 +49,6 @@ my ($template, $loggedinuser, $cookie) = get_template_and_user({
     template_name => "offline_circ/enqueue_koc.tt",
     query => $query,
     type => "intranet",
-    authnotrequired => 0,
      flagsrequired   => { circulate => "circulate_remaining_permissions" },
 });
 
diff --git a/offline_circ/list.pl b/offline_circ/list.pl
index a58e94d06f..f5146444c4 100755
--- a/offline_circ/list.pl
+++ b/offline_circ/list.pl
@@ -38,7 +38,6 @@ my ($template, $loggedinuser, $cookie) = get_template_and_user({
     template_name => "offline_circ/list.tt",
     query => $query,
     type => "intranet",
-    authnotrequired => 0,
     flagsrequired   => { circulate => "circulate_remaining_permissions" },
 });
 
diff --git a/offline_circ/process.pl b/offline_circ/process.pl
index a8a59dd73f..39963e67ee 100755
--- a/offline_circ/process.pl
+++ b/offline_circ/process.pl
@@ -30,7 +30,6 @@ my ($template, $loggedinuser, $cookie) = get_template_and_user({
     template_name => "offline_circ/list.tt",
     query => $query,
     type => "intranet",
-    authnotrequired => 0,
     flagsrequired   => { circulate => "circulate_remaining_permissions" },
 });
 
diff --git a/offline_circ/process_koc.pl b/offline_circ/process_koc.pl
index aacfeda81e..1960c0a2c6 100755
--- a/offline_circ/process_koc.pl
+++ b/offline_circ/process_koc.pl
@@ -52,7 +52,6 @@ my ($template, $loggedinuser, $cookie) = get_template_and_user({
     template_name => "offline_circ/process_koc.tt",
     query => $query,
     type => "intranet",
-    authnotrequired => 0,
      flagsrequired   => { circulate => "circulate_remaining_permissions" },
 });
 
diff --git a/opac/clubs/clubs-tab.pl b/opac/clubs/clubs-tab.pl
index 701d8cfb69..bb73d0ba07 100755
--- a/opac/clubs/clubs-tab.pl
+++ b/opac/clubs/clubs-tab.pl
@@ -32,7 +32,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         template_name   => "clubs/clubs-tab.tt",
         query           => $cgi,
         type            => "opac",
-        authnotrequired => 0,
     }
 );
 
diff --git a/opac/clubs/enroll.pl b/opac/clubs/enroll.pl
index 91b395ed6e..5d16a4a46c 100755
--- a/opac/clubs/enroll.pl
+++ b/opac/clubs/enroll.pl
@@ -32,7 +32,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         template_name   => "clubs/enroll.tt",
         query           => $cgi,
         type            => "opac",
-        authnotrequired => 0,
     }
 );
 
diff --git a/opac/opac-account-pay-paypal-return.pl b/opac/opac-account-pay-paypal-return.pl
index 07ed4bc5e7..0ac88f4ad5 100755
--- a/opac/opac-account-pay-paypal-return.pl
+++ b/opac/opac-account-pay-paypal-return.pl
@@ -44,7 +44,6 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
         template_name   => "opac-account-pay-return.tt",
         query           => $cgi,
         type            => "opac",
-        authnotrequired => 0,
         debug           => 1,
     }
 );
diff --git a/opac/opac-account-pay.pl b/opac/opac-account-pay.pl
index 470e4430c6..ae198dcc1b 100755
--- a/opac/opac-account-pay.pl
+++ b/opac/opac-account-pay.pl
@@ -58,7 +58,6 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
         template_name   => "opac-account-pay-error.tt",
         query           => $cgi,
         type            => "opac",
-        authnotrequired => 0,
         debug           => 1,
     }
 );
diff --git a/opac/opac-account.pl b/opac/opac-account.pl
index 8ba2ba33f8..aeca5ac7b8 100755
--- a/opac/opac-account.pl
+++ b/opac/opac-account.pl
@@ -34,7 +34,6 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
         template_name   => "opac-account.tt",
         query           => $query,
         type            => "opac",
-        authnotrequired => 0,
         debug           => 1,
     }
 );
diff --git a/opac/opac-addbybiblionumber.pl b/opac/opac-addbybiblionumber.pl
index 67b88f8064..16ec335180 100755
--- a/opac/opac-addbybiblionumber.pl
+++ b/opac/opac-addbybiblionumber.pl
@@ -52,7 +52,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {   template_name   => "opac-addbybiblionumber.tt",
         query           => $query,
         type            => "opac",
-        authnotrequired => 0,
     }
 );
 
diff --git a/opac/opac-article-request-cancel.pl b/opac/opac-article-request-cancel.pl
index ef9f75345d..2291249b2d 100755
--- a/opac/opac-article-request-cancel.pl
+++ b/opac/opac-article-request-cancel.pl
@@ -32,7 +32,6 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
         template_name   => "opac-account.tt",
         query           => $query,
         type            => "opac",
-        authnotrequired => 0,
         debug           => 1,
     }
 );
diff --git a/opac/opac-ics.pl b/opac/opac-ics.pl
index fb1ae4db68..94ea5fde91 100755
--- a/opac/opac-ics.pl
+++ b/opac/opac-ics.pl
@@ -41,7 +41,6 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
         template_name   => "opac-ics.tt",
         query           => $query,
         type            => "opac",
-        authnotrequired => 0,
         debug           => 1,
     }
 );
diff --git a/opac/opac-illrequests.pl b/opac/opac-illrequests.pl
index f35b19ada9..402bc2dedb 100755
--- a/opac/opac-illrequests.pl
+++ b/opac/opac-illrequests.pl
@@ -46,7 +46,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user({
     template_name   => "opac-illrequests.tt",
     query           => $query,
     type            => "opac",
-    authnotrequired => 0,
 });
 
 # Are we able to actually work?
diff --git a/opac/opac-issue-note.pl b/opac/opac-issue-note.pl
index f61b33cd8f..a601fef9ff 100755
--- a/opac/opac-issue-note.pl
+++ b/opac/opac-issue-note.pl
@@ -38,7 +38,6 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
         template_name   => "opac-issue-note.tt",
         query           => $query,
         type            => "opac",
-        authnotrequired => 0,
         debug           => 1,
     }
 );
diff --git a/opac/opac-messaging.pl b/opac/opac-messaging.pl
index 210f9446c0..972b1cedbf 100755
--- a/opac/opac-messaging.pl
+++ b/opac/opac-messaging.pl
@@ -46,7 +46,6 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
         template_name   => 'opac-messaging.tt',
         query           => $query,
         type            => 'opac',
-        authnotrequired => 0,
         debug           => 1,
     }
 );
diff --git a/opac/opac-modrequest-suspend.pl b/opac/opac-modrequest-suspend.pl
index debeb30f6d..046b049f62 100755
--- a/opac/opac-modrequest-suspend.pl
+++ b/opac/opac-modrequest-suspend.pl
@@ -27,7 +27,6 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
         template_name   => "opac-account.tt",
         query           => $query,
         type            => "opac",
-        authnotrequired => 0,
         debug           => 1,
     }
 );
diff --git a/opac/opac-modrequest.pl b/opac/opac-modrequest.pl
index e86cd43b34..45fc6bc680 100755
--- a/opac/opac-modrequest.pl
+++ b/opac/opac-modrequest.pl
@@ -36,7 +36,6 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
         template_name   => "opac-account.tt",
         query           => $query,
         type            => "opac",
-        authnotrequired => 0,
         debug           => 1,
     }
 );
diff --git a/opac/opac-mymessages.pl b/opac/opac-mymessages.pl
index 31bbd0ccac..8991c4e998 100755
--- a/opac/opac-mymessages.pl
+++ b/opac/opac-mymessages.pl
@@ -34,7 +34,6 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
         template_name   => 'opac-mymessages.tt',
         query           => $query,
         type            => 'opac',
-        authnotrequired => 0,
         debug           => 1,
     }
 );
diff --git a/opac/opac-passwd.pl b/opac/opac-passwd.pl
index bff0214a9f..2e02d69f05 100755
--- a/opac/opac-passwd.pl
+++ b/opac/opac-passwd.pl
@@ -38,7 +38,6 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
         template_name   => "opac-passwd.tt",
         query           => $query,
         type            => "opac",
-        authnotrequired => 0,
         debug           => 1,
     }
 );
diff --git a/opac/opac-patron-consent.pl b/opac/opac-patron-consent.pl
index 8f7fb25c0a..e176b7f8b7 100755
--- a/opac/opac-patron-consent.pl
+++ b/opac/opac-patron-consent.pl
@@ -36,7 +36,6 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user({
     template_name   => "opac-patron-consent.tt",
     query           => $query,
     type            => "opac",
-    authnotrequired => 0,
 });
 
 my $patron = Koha::Patrons->find($borrowernumber);
diff --git a/opac/opac-privacy.pl b/opac/opac-privacy.pl
index 7d7f445c39..0b2d414a30 100755
--- a/opac/opac-privacy.pl
+++ b/opac/opac-privacy.pl
@@ -39,7 +39,6 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
         template_name   => "opac-privacy.tt",
         query           => $query,
         type            => "opac",
-        authnotrequired => 0,
         debug           => 1,
     }
 );
diff --git a/opac/opac-readingrecord.pl b/opac/opac-readingrecord.pl
index c13faacaa3..5cd38b9141 100755
--- a/opac/opac-readingrecord.pl
+++ b/opac/opac-readingrecord.pl
@@ -49,7 +49,6 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
         template_name   => "opac-readingrecord.tt",
         query           => $query,
         type            => "opac",
-        authnotrequired => 0,
         debug           => 1,
     }
 );
diff --git a/opac/opac-renew.pl b/opac/opac-renew.pl
index 85570d54ad..aeee54579b 100755
--- a/opac/opac-renew.pl
+++ b/opac/opac-renew.pl
@@ -39,7 +39,6 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
         template_name   => "opac-user.tt",
         query           => $query,
         type            => "opac",
-        authnotrequired => 0,
         debug           => 1,
 	}
 ); 
diff --git a/opac/opac-request-article.pl b/opac/opac-request-article.pl
index e6ea45cdd8..30947363f6 100755
--- a/opac/opac-request-article.pl
+++ b/opac/opac-request-article.pl
@@ -34,7 +34,6 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
         template_name   => "opac-request-article.tt",
         query           => $cgi,
         type            => "opac",
-        authnotrequired => 0,
         debug           => 1,
     }
 );
diff --git a/opac/opac-reserve.pl b/opac/opac-reserve.pl
index 4d7cf1334c..f7c26d09ec 100755
--- a/opac/opac-reserve.pl
+++ b/opac/opac-reserve.pl
@@ -60,7 +60,6 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
         template_name   => "opac-reserve.tt",
         query           => $query,
         type            => "opac",
-        authnotrequired => 0,
         debug           => 1,
     }
 );
diff --git a/opac/opac-routing-lists.pl b/opac/opac-routing-lists.pl
index 8c806e905c..8e4771cce1 100755
--- a/opac/opac-routing-lists.pl
+++ b/opac/opac-routing-lists.pl
@@ -36,7 +36,6 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
         template_name   => "opac-routing-lists.tt",
         query           => $query,
         type            => "opac",
-        authnotrequired => 0,
         debug           => 1,
     }
 );
diff --git a/opac/opac-sendbasket.pl b/opac/opac-sendbasket.pl
index d5e6c7fdfd..ba0562db70 100755
--- a/opac/opac-sendbasket.pl
+++ b/opac/opac-sendbasket.pl
@@ -43,7 +43,6 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user (
         template_name   => "opac-sendbasketform.tt",
         query           => $query,
         type            => "opac",
-        authnotrequired => 0,
     }
 );
 
diff --git a/opac/opac-sendshelf.pl b/opac/opac-sendshelf.pl
index acbc27e6d2..9f0f5ca0ca 100755
--- a/opac/opac-sendshelf.pl
+++ b/opac/opac-sendshelf.pl
@@ -48,7 +48,6 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user (
         template_name   => "opac-sendshelfform.tt",
         query           => $query,
         type            => "opac",
-        authnotrequired => 0,
     }
 );
 
diff --git a/opac/opac-suggestions.pl b/opac/opac-suggestions.pl
index c616f59033..351c40ed82 100755
--- a/opac/opac-suggestions.pl
+++ b/opac/opac-suggestions.pl
@@ -79,7 +79,6 @@ else {
             template_name   => "opac-suggestions.tt",
             query           => $input,
             type            => "opac",
-            authnotrequired => 0,
         }
     );
 }
diff --git a/opac/opac-user.pl b/opac/opac-user.pl
index 96e9bf42fb..aff5e540af 100755
--- a/opac/opac-user.pl
+++ b/opac/opac-user.pl
@@ -66,7 +66,6 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
         template_name   => "opac-user.tt",
         query           => $query,
         type            => "opac",
-        authnotrequired => 0,
         debug           => 1,
     }
 );
diff --git a/opac/sci/sci-main.pl b/opac/sci/sci-main.pl
index 84d2a6cb67..0128873487 100755
--- a/opac/sci/sci-main.pl
+++ b/opac/sci/sci-main.pl
@@ -40,7 +40,6 @@ $cgi->param( -name => 'sci_user_login', -values => [1] );
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
         template_name   => "sci/sci-main.tt",
-        authnotrequired => 0,
         flagsrequired   => { self_check => 'self_checkin_module' },
         query           => $cgi,
         type            => "opac"
diff --git a/opac/sco/sco-main.pl b/opac/sco/sco-main.pl
index 69363eac0a..a901d254b1 100755
--- a/opac/sco/sco-main.pl
+++ b/opac/sco/sco-main.pl
@@ -78,7 +78,6 @@ $query->param(-name=>'sco_user_login',-values=>[1]);
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
         template_name   => "sco/sco-main.tt",
-        authnotrequired => 0,
         flagsrequired   => { self_check => "self_checkout_module" },
         query           => $query,
         type            => "opac",
diff --git a/opac/svc/auth/googleopenidconnect b/opac/svc/auth/googleopenidconnect
index 14568a0383..5a18c87a38 100755
--- a/opac/svc/auth/googleopenidconnect
+++ b/opac/svc/auth/googleopenidconnect
@@ -81,7 +81,6 @@ sub loginfailed {
             template_name   => 'opac-user.tt',
             query           => $cgi_query,
             type            => 'opac',
-            authnotrequired => 0,
         }
     );
     $template->param( 'invalidGoogleOpenIDConnectLogin' => $reason );
diff --git a/patron_lists/add-modify.pl b/patron_lists/add-modify.pl
index 956d882448..b0b39ccfbd 100755
--- a/patron_lists/add-modify.pl
+++ b/patron_lists/add-modify.pl
@@ -32,7 +32,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         template_name   => "patron_lists/add-modify.tt",
         query           => $cgi,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired => { tools => 'manage_patron_lists' },
     }
 );
diff --git a/patron_lists/delete.pl b/patron_lists/delete.pl
index f9d1aef19c..7751fe80c2 100755
--- a/patron_lists/delete.pl
+++ b/patron_lists/delete.pl
@@ -32,7 +32,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         template_name   => "patron_lists/lists.tt",
         query           => $cgi,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired => { tools => 'manage_patron_lists' },
     }
 );
diff --git a/patron_lists/list.pl b/patron_lists/list.pl
index 71bfa3814a..90b580106e 100755
--- a/patron_lists/list.pl
+++ b/patron_lists/list.pl
@@ -33,7 +33,6 @@ my ( $template, $logged_in_user, $cookie ) = get_template_and_user(
         template_name   => "patron_lists/list.tt",
         query           => $cgi,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired => { tools => 'manage_patron_lists' },
     }
 );
diff --git a/patron_lists/lists.pl b/patron_lists/lists.pl
index a5cdf2b74c..cdb055a351 100755
--- a/patron_lists/lists.pl
+++ b/patron_lists/lists.pl
@@ -32,7 +32,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         template_name   => "patron_lists/lists.tt",
         query           => $cgi,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired => { tools => 'manage_patron_lists' },
     }
 );
diff --git a/patron_lists/patrons.pl b/patron_lists/patrons.pl
index 658f92de8f..2c10923ca8 100755
--- a/patron_lists/patrons.pl
+++ b/patron_lists/patrons.pl
@@ -32,7 +32,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         template_name   => "patron_lists/add-modify.tt",
         query           => $cgi,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired => { tools => 'manage_patron_lists' },
     }
 );
diff --git a/patroncards/add_user_search.pl b/patroncards/add_user_search.pl
index c8eca5fa74..9551ab03cf 100755
--- a/patroncards/add_user_search.pl
+++ b/patroncards/add_user_search.pl
@@ -34,7 +34,6 @@ my ( $template, $loggedinuser, $cookie, $staff_flags ) = get_template_and_user(
     {   template_name   => "common/patron_search.tt",
         query           => $input,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { catalogue => 1 },
     }
 );
diff --git a/patroncards/create-pdf.pl b/patroncards/create-pdf.pl
index 154377ce0e..31f01cd281 100755
--- a/patroncards/create-pdf.pl
+++ b/patroncards/create-pdf.pl
@@ -40,7 +40,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user({
                                                                      template_name   => "labels/label-home.tt",
                                                                      query           => $cgi,
                                                                      type            => "intranet",
-                                                                     authnotrequired => 0,
                                                                      flagsrequired   => { tools => 'label_creator' },
                                                                      debug           => 1,
                                                                      });
diff --git a/patroncards/edit-batch.pl b/patroncards/edit-batch.pl
index 236706e1bc..990642e9bf 100755
--- a/patroncards/edit-batch.pl
+++ b/patroncards/edit-batch.pl
@@ -37,7 +37,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         template_name   => "patroncards/edit-batch.tt",
         query           => $cgi,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { catalogue => 1 },
         debug           => 1,
     }
diff --git a/patroncards/edit-layout.pl b/patroncards/edit-layout.pl
index 3c7612992d..6ff61010df 100755
--- a/patroncards/edit-layout.pl
+++ b/patroncards/edit-layout.pl
@@ -36,7 +36,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         template_name   => "patroncards/edit-layout.tt",
         query           => $cgi,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { catalogue => 1 },
         debug           => 1,
     }
diff --git a/patroncards/edit-profile.pl b/patroncards/edit-profile.pl
index d84fb19b13..6f3782b1b6 100755
--- a/patroncards/edit-profile.pl
+++ b/patroncards/edit-profile.pl
@@ -33,7 +33,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         template_name   => "patroncards/edit-profile.tt",
         query           => $cgi,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { catalogue => 1 },
         debug           => 1,
     }
diff --git a/patroncards/edit-template.pl b/patroncards/edit-template.pl
index 3712a6fd82..8ac1e487b0 100755
--- a/patroncards/edit-template.pl
+++ b/patroncards/edit-template.pl
@@ -34,7 +34,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         template_name   => "patroncards/edit-template.tt",
         query           => $cgi,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { catalogue => 1 },
         debug           => 1,
     }
diff --git a/patroncards/home.pl b/patroncards/home.pl
index cb8e7a5b06..bd0c16c826 100755
--- a/patroncards/home.pl
+++ b/patroncards/home.pl
@@ -31,7 +31,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         template_name   => "patroncards/home.tt",
         query           => $cgi,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { catalogue => 1 },
         debug           => 1,
     }
diff --git a/patroncards/image-manage.pl b/patroncards/image-manage.pl
index 2c08123427..76a2a2722e 100755
--- a/patroncards/image-manage.pl
+++ b/patroncards/image-manage.pl
@@ -19,7 +19,6 @@ my ($template, $loggedinuser, $cookie) = get_template_and_user({
                     template_name       => "patroncards/image-manage.tt",
                     query               => $cgi,
                     type                => "intranet",
-                    authnotrequired     => 0,
                     flagsrequired       => {tools => 'batch_upload_patron_images'}, # FIXME: establish flag for patron card creator
                     debug               => 0,
                     });
diff --git a/patroncards/manage.pl b/patroncards/manage.pl
index 42503fe196..1611e7950b 100755
--- a/patroncards/manage.pl
+++ b/patroncards/manage.pl
@@ -37,7 +37,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         template_name   => "patroncards/manage.tt",
         query           => $cgi,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { catalogue => 1 },
         debug           => 1,
     }
diff --git a/patroncards/print.pl b/patroncards/print.pl
index 8992038fec..af3c09220d 100755
--- a/patroncards/print.pl
+++ b/patroncards/print.pl
@@ -33,7 +33,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         template_name   => "patroncards/print.tt",
         query           => $cgi,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { catalogue => 1 },
         debug           => 1,
     }
diff --git a/plugins/plugins-home.pl b/plugins/plugins-home.pl
index 1136a2c717..04a817aede 100755
--- a/plugins/plugins-home.pl
+++ b/plugins/plugins-home.pl
@@ -36,7 +36,6 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
     {   template_name => ($plugins_enabled) ? "plugins/plugins-home.tt" : "plugins/plugins-disabled.tt",
         query         => $input,
         type          => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { plugins => '*' },
         debug           => 1,
     }
diff --git a/plugins/plugins-uninstall.pl b/plugins/plugins-uninstall.pl
index 16138e8288..fd5c436b23 100755
--- a/plugins/plugins-uninstall.pl
+++ b/plugins/plugins-uninstall.pl
@@ -38,7 +38,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {   template_name   => "plugins/plugins-upload.tt",
         query           => $input,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { plugins => 'manage' },
         debug           => 1,
     }
diff --git a/plugins/plugins-upload.pl b/plugins/plugins-upload.pl
index c849942c47..142761e898 100755
--- a/plugins/plugins-upload.pl
+++ b/plugins/plugins-upload.pl
@@ -38,7 +38,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {   template_name => ($plugins_enabled) ? "plugins/plugins-upload.tt" : "plugins/plugins-disabled.tt",
         query         => $input,
         type          => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { plugins => 'manage' },
         debug           => 1,
     }
diff --git a/plugins/run.pl b/plugins/run.pl
index da265de1fd..f19e31657b 100755
--- a/plugins/run.pl
+++ b/plugins/run.pl
@@ -38,7 +38,6 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
     {   template_name   => "plugins/plugins-disabled.tt",
         query           => $cgi,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { plugins => $method },
         debug           => 1,
     }
diff --git a/reports/acquisitions_stats.pl b/reports/acquisitions_stats.pl
index d7dea6a85f..d9a73be231 100755
--- a/reports/acquisitions_stats.pl
+++ b/reports/acquisitions_stats.pl
@@ -66,7 +66,6 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
         template_name   => $fullreportname,
         query           => $input,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { reports => '*' },
         debug           => 1,
     }
diff --git a/reports/bor_issues_top.pl b/reports/bor_issues_top.pl
index 84a46a36a2..45fcb77dce 100755
--- a/reports/bor_issues_top.pl
+++ b/reports/bor_issues_top.pl
@@ -58,7 +58,6 @@ my ($template, $borrowernumber, $cookie)
     = get_template_and_user({template_name => $fullreportname,
                 query => $input,
                 type => "intranet",
-                authnotrequired => 0,
                 flagsrequired => {reports => '*'},
                 debug => 1,
                 });
diff --git a/reports/borrowers_out.pl b/reports/borrowers_out.pl
index 762a0d4d09..43cdbf6807 100755
--- a/reports/borrowers_out.pl
+++ b/reports/borrowers_out.pl
@@ -58,7 +58,6 @@ my ($template, $borrowernumber, $cookie)
     = get_template_and_user({template_name => $fullreportname,
                 query => $input,
                 type => "intranet",
-                authnotrequired => 0,
                 flagsrequired => {reports => '*'},
                 debug => 1,
                 });
diff --git a/reports/borrowers_stats.pl b/reports/borrowers_stats.pl
index 73c655cb6e..06baf561c9 100755
--- a/reports/borrowers_stats.pl
+++ b/reports/borrowers_stats.pl
@@ -71,7 +71,6 @@ my ($template, $borrowernumber, $cookie)
 	= get_template_and_user({template_name => $fullreportname,
 				query => $input,
 				type => "intranet",
-				authnotrequired => 0,
 				flagsrequired => {reports => '*'},
 				debug => 1,
 				});
diff --git a/reports/cash_register_stats.pl b/reports/cash_register_stats.pl
index 6fbbbfbf9b..69bea2e77c 100755
--- a/reports/cash_register_stats.pl
+++ b/reports/cash_register_stats.pl
@@ -37,7 +37,6 @@ my ($template, $borrowernumber, $cookie) = get_template_and_user({
     template_name => "reports/cash_register_stats.tt",
     query => $input,
     type => "intranet",
-    authnotrequired => 0,
     flagsrequired => {reports => '*'},
     debug => 1,
 });
diff --git a/reports/cat_issues_top.pl b/reports/cat_issues_top.pl
index 604258e9c9..0792a28c6d 100755
--- a/reports/cat_issues_top.pl
+++ b/reports/cat_issues_top.pl
@@ -55,7 +55,6 @@ my ($template, $borrowernumber, $cookie)
     = get_template_and_user({template_name => $fullreportname,
                 query => $input,
                 type => "intranet",
-                authnotrequired => 0,
                 flagsrequired => { reports => '*'},
                 debug => 1,
                 });
diff --git a/reports/catalogue_out.pl b/reports/catalogue_out.pl
index 3b0fdd8f74..09034d7501 100755
--- a/reports/catalogue_out.pl
+++ b/reports/catalogue_out.pl
@@ -44,7 +44,6 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
         template_name   => "reports/catalogue_out.tt",
         query           => $input,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { reports => 'execute_reports' },
         debug           => 1,
     }
diff --git a/reports/catalogue_stats.pl b/reports/catalogue_stats.pl
index b7bd98a024..7942812a8a 100755
--- a/reports/catalogue_stats.pl
+++ b/reports/catalogue_stats.pl
@@ -70,7 +70,6 @@ my ($template, $borrowernumber, $cookie)
 	= get_template_and_user({template_name => $fullreportname,
 				query => $input,
 				type => "intranet",
-				authnotrequired => 0,
 				flagsrequired => {reports => '*'},
 				debug => 1,
 				});
diff --git a/reports/dictionary.pl b/reports/dictionary.pl
index bca95ce0bd..2c89904494 100755
--- a/reports/dictionary.pl
+++ b/reports/dictionary.pl
@@ -44,7 +44,6 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
     {   template_name   => "reports/dictionary.tt",
         query           => $input,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { reports => '*' },
         debug           => 1,
     }
diff --git a/reports/guided_reports.pl b/reports/guided_reports.pl
index f52a6df432..f455f4c1f0 100755
--- a/reports/guided_reports.pl
+++ b/reports/guided_reports.pl
@@ -74,7 +74,6 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
         template_name   => "reports/guided_reports_start.tt",
         query           => $input,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { reports => $flagsrequired },
         debug           => 1,
     }
diff --git a/reports/issues_avg_stats.pl b/reports/issues_avg_stats.pl
index cea969e5b0..7bee185718 100755
--- a/reports/issues_avg_stats.pl
+++ b/reports/issues_avg_stats.pl
@@ -66,7 +66,6 @@ my ($template, $borrowernumber, $cookie)
     = get_template_and_user({template_name => $fullreportname,
                 query => $input,
                 type => "intranet",
-                authnotrequired => 0,
                 flagsrequired => {reports => '*'},
                 debug => 1,
                     });
diff --git a/reports/issues_stats.pl b/reports/issues_stats.pl
index 3c1ba1facb..51738f34d7 100755
--- a/reports/issues_stats.pl
+++ b/reports/issues_stats.pl
@@ -78,7 +78,6 @@ my ($template, $borrowernumber, $cookie) = get_template_and_user({
 	template_name => $fullreportname,
 	query => $input,
 	type => "intranet",
-	authnotrequired => 0,
 	flagsrequired => {reports => '*'},
 	debug => 0,
 });
diff --git a/reports/itemslost.pl b/reports/itemslost.pl
index cd5fbe4b95..de1e798609 100755
--- a/reports/itemslost.pl
+++ b/reports/itemslost.pl
@@ -44,7 +44,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         template_name   => "reports/itemslost.tt",
         query           => $query,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { reports => '*' },
         debug           => 1,
     }
diff --git a/reports/manager.pl b/reports/manager.pl
index 2ff27e8283..82a9cb6c3c 100755
--- a/reports/manager.pl
+++ b/reports/manager.pl
@@ -34,7 +34,6 @@ my ($template, $borrowernumber, $cookie)
 	= get_template_and_user({template_name => $fullreportname,
 				query => $input,
 				type => "intranet",
-				authnotrequired => 0,
 				flagsrequired => {reports => '*'},
 				debug => 1,
 				});
diff --git a/reports/orders_by_fund.pl b/reports/orders_by_fund.pl
index 4e797c2d25..7f50e9af38 100755
--- a/reports/orders_by_fund.pl
+++ b/reports/orders_by_fund.pl
@@ -43,7 +43,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         template_name   => "reports/orders_by_budget.tt",
         query           => $query,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { reports => '*' },
         debug           => 1,
     }
diff --git a/reports/reports-home.pl b/reports/reports-home.pl
index 6bcc996466..b8ba0aa853 100755
--- a/reports/reports-home.pl
+++ b/reports/reports-home.pl
@@ -30,7 +30,6 @@ my ($template, $loggedinuser, $cookie)
 = get_template_and_user({template_name => "reports/reports-home.tt",
 				query => $query,
 				type => "intranet",
-				authnotrequired => 0,
 				flagsrequired => {reports => '*'},
 				debug => 1,
 				});
diff --git a/reports/reserves_stats.pl b/reports/reserves_stats.pl
index 09bfd0c729..030b4b54ce 100755
--- a/reports/reserves_stats.pl
+++ b/reports/reserves_stats.pl
@@ -66,7 +66,6 @@ my ($template, $borrowernumber, $cookie) = get_template_and_user({
 	template_name => $fullreportname,
 	query => $input,
 	type => "intranet",
-	authnotrequired => 0,
 	flagsrequired => {reports => '*'},
 	debug => 0,
 });
diff --git a/reports/serials_stats.pl b/reports/serials_stats.pl
index a27c404292..10c0a6e81c 100755
--- a/reports/serials_stats.pl
+++ b/reports/serials_stats.pl
@@ -50,7 +50,6 @@ my ($template, $borrowernumber, $cookie)
 	= get_template_and_user({template_name => $templatename,
 				query => $input,
 				type => "intranet",
-				authnotrequired => 0,
 				flagsrequired => {reports => '*'},
 				debug => 1,
 				});
diff --git a/reserve/modrequest.pl b/reserve/modrequest.pl
index 40c390297f..8872f4da94 100755
--- a/reserve/modrequest.pl
+++ b/reserve/modrequest.pl
@@ -35,7 +35,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         template_name   => "about.tt",
         query           => $query,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { catalogue => 1 },
         debug           => 1,
     }
diff --git a/reserve/modrequest_suspendall.pl b/reserve/modrequest_suspendall.pl
index e53e06011e..ea303f3083 100755
--- a/reserve/modrequest_suspendall.pl
+++ b/reserve/modrequest_suspendall.pl
@@ -34,7 +34,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         template_name   => "about.tt",
         query           => $query,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { catalogue => 1 },
         debug           => 1,
     }
diff --git a/reserve/request.pl b/reserve/request.pl
index 92f75b2c26..b4501ef111 100755
--- a/reserve/request.pl
+++ b/reserve/request.pl
@@ -62,7 +62,6 @@ my ( $template, $borrowernumber, $cookie, $flags ) = get_template_and_user(
         template_name   => "reserve/request.tt",
         query           => $input,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { reserveforothers => 'place_holds' },
     }
 );
diff --git a/reviews/reviewswaiting.pl b/reviews/reviewswaiting.pl
index 6dc51f1349..e115941366 100755
--- a/reviews/reviewswaiting.pl
+++ b/reviews/reviewswaiting.pl
@@ -32,7 +32,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         template_name   => "reviews/reviewswaiting.tt",
         query           => $query,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { tools => 'moderate_comments' },
         debug           => 1,
     }
diff --git a/rotating_collections/addItems.pl b/rotating_collections/addItems.pl
index 4c79328f3f..b52113a5dd 100755
--- a/rotating_collections/addItems.pl
+++ b/rotating_collections/addItems.pl
@@ -35,7 +35,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         template_name   => "rotating_collections/addItems.tt",
         query           => $query,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { tools => 'rotating_collections' },
         debug           => 1,
     }
diff --git a/rotating_collections/editCollections.pl b/rotating_collections/editCollections.pl
index c8ed8ed03b..4df8942508 100755
--- a/rotating_collections/editCollections.pl
+++ b/rotating_collections/editCollections.pl
@@ -33,7 +33,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         template_name   => "rotating_collections/editCollections.tt",
         query           => $query,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { tools => 'rotating_collections' },
         debug           => 1,
     }
diff --git a/rotating_collections/rotatingCollections.pl b/rotating_collections/rotatingCollections.pl
index acf4586568..941f778681 100755
--- a/rotating_collections/rotatingCollections.pl
+++ b/rotating_collections/rotatingCollections.pl
@@ -32,7 +32,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         template_name   => "rotating_collections/rotatingCollections.tt",
         query           => $query,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { tools => 'rotating_collections' },
         debug           => 1,
     }
diff --git a/rotating_collections/transferCollection.pl b/rotating_collections/transferCollection.pl
index 49b09b3113..bdee62a83e 100755
--- a/rotating_collections/transferCollection.pl
+++ b/rotating_collections/transferCollection.pl
@@ -35,7 +35,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         template_name   => "rotating_collections/transferCollection.tt",
         query           => $query,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { tools => 'rotating_collections' },
         debug           => 1,
     }
diff --git a/serials/acqui-search-result.pl b/serials/acqui-search-result.pl
index ede6c89a7b..1897f5fec8 100755
--- a/serials/acqui-search-result.pl
+++ b/serials/acqui-search-result.pl
@@ -55,7 +55,6 @@ my ($template, $loggedinuser, $cookie)
     = get_template_and_user({template_name => "serials/acqui-search-result.tt",
                  query => $query,
                  type => "intranet",
-                 authnotrequired => 0,
                  flagsrequired => {serials => '*'},
                  debug => 1,
                  });
diff --git a/serials/acqui-search.pl b/serials/acqui-search.pl
index bc25c69e58..95b02c23ac 100755
--- a/serials/acqui-search.pl
+++ b/serials/acqui-search.pl
@@ -30,7 +30,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         template_name   => "serials/acqui-search.tt",
         query           => $query,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { serials => '*' },
         debug           => 1,
     }
diff --git a/serials/add_user_search.pl b/serials/add_user_search.pl
index 6cb177acbe..6b77c9e0c1 100755
--- a/serials/add_user_search.pl
+++ b/serials/add_user_search.pl
@@ -34,7 +34,6 @@ my ( $template, $loggedinuser, $cookie, $staff_flags ) = get_template_and_user(
     {   template_name   => "common/patron_search.tt",
         query           => $input,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired => { serials => 'routing' },
     }
 );
diff --git a/serials/checkexpiration.pl b/serials/checkexpiration.pl
index ae88841444..4f0c1e8001 100755
--- a/serials/checkexpiration.pl
+++ b/serials/checkexpiration.pl
@@ -59,7 +59,6 @@ my ( $template, $loggedinuser, $cookie, $flags ) = get_template_and_user (
         template_name   => "serials/checkexpiration.tt",
         query           => $query,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { serials => 'check_expiration' },
         debug           => 1,
     }
diff --git a/serials/claims.pl b/serials/claims.pl
index 2ed81b8745..4c6a2728a9 100755
--- a/serials/claims.pl
+++ b/serials/claims.pl
@@ -43,7 +43,6 @@ my ($template, $loggedinuser, $cookie)
 = get_template_and_user({template_name => 'serials/claims.tt',
             query => $input,
             type => 'intranet',
-            authnotrequired => 0,
             flagsrequired => {serials => 'claim_serials'},
             debug => 1,
             });
diff --git a/serials/routing-preview.pl b/serials/routing-preview.pl
index 7ddbfe5054..5cba916ccc 100755
--- a/serials/routing-preview.pl
+++ b/serials/routing-preview.pl
@@ -103,7 +103,6 @@ if($ok){
 = get_template_and_user({template_name => "serials/routing-preview-slip.tt",
 				query => $query,
 				type => "intranet",
-				authnotrequired => 0,
 				flagsrequired => {serials => '*'},
 				debug => 1,
 				});
@@ -112,7 +111,6 @@ if($ok){
 = get_template_and_user({template_name => "serials/routing-preview.tt",
 				query => $query,
 				type => "intranet",
-				authnotrequired => 0,
 				flagsrequired => {serials => '*'},
 				debug => 1,
 				});
diff --git a/serials/routing.pl b/serials/routing.pl
index 8d893f66de..49aa9c3e39 100755
--- a/serials/routing.pl
+++ b/serials/routing.pl
@@ -56,7 +56,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         template_name   => 'serials/routing.tt',
         query           => $query,
         type            => 'intranet',
-        authnotrequired => 0,
         flagsrequired   => { serials => 'routing' },
     }
 );
diff --git a/serials/serials-collection.pl b/serials/serials-collection.pl
index d9ab11a61e..e15796de07 100755
--- a/serials/serials-collection.pl
+++ b/serials/serials-collection.pl
@@ -43,7 +43,6 @@ my ($template, $loggedinuser, $cookie)
   = get_template_and_user({template_name => "serials/serials-collection.tt",
                             query => $query,
                             type => "intranet",
-                            authnotrequired => 0,
                             flagsrequired => {serials => '*'},
                             debug => 1,
                             });
diff --git a/serials/serials-edit.pl b/serials/serials-edit.pl
index f791c2e69a..57ceba86e4 100755
--- a/serials/serials-edit.pl
+++ b/serials/serials-edit.pl
@@ -122,7 +122,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         template_name   => 'serials/serials-edit.tt',
         query           => $query,
         type            => 'intranet',
-        authnotrequired => 0,
         flagsrequired   => { serials => 'receive_serials' },
         debug           => 1,
     }
diff --git a/serials/serials-home.pl b/serials/serials-home.pl
index cf59cb8b7d..3fc15d03fb 100755
--- a/serials/serials-home.pl
+++ b/serials/serials-home.pl
@@ -43,7 +43,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         template_name   => "serials/serials-home.tt",
         query           => $query,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { serials => '*' },
         debug           => 1,
     }
diff --git a/serials/serials-search.pl b/serials/serials-search.pl
index fe9347eb03..456a6cd431 100755
--- a/serials/serials-search.pl
+++ b/serials/serials-search.pl
@@ -62,7 +62,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         template_name   => "serials/serials-search.tt",
         query           => $query,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { serials => '*' },
         debug           => 1,
     }
diff --git a/serials/showpredictionpattern.pl b/serials/showpredictionpattern.pl
index 4a3f7b2a64..78fbea98a5 100755
--- a/serials/showpredictionpattern.pl
+++ b/serials/showpredictionpattern.pl
@@ -43,7 +43,6 @@ my ($template, $loggedinuser, $cookie, $flags) = get_template_and_user( {
     template_name   => 'serials/showpredictionpattern.tt',
     query           => $input,
     type            => 'intranet',
-    authnotrequired => 0,
     flagsrequired   => { 'serials' => '*' },
 } );
 
diff --git a/serials/subscription-add.pl b/serials/subscription-add.pl
index ebc19a05e9..5121155a3d 100755
--- a/serials/subscription-add.pl
+++ b/serials/subscription-add.pl
@@ -56,7 +56,6 @@ our ($template, $loggedinuser, $cookie)
 = get_template_and_user({template_name => "serials/subscription-add.tt",
 				query => $query,
 				type => "intranet",
-				authnotrequired => 0,
 				flagsrequired => {serials => $permission},
 				debug => 1,
 				});
diff --git a/serials/subscription-batchedit.pl b/serials/subscription-batchedit.pl
index fa114a18e2..fcc3aa43b0 100755
--- a/serials/subscription-batchedit.pl
+++ b/serials/subscription-batchedit.pl
@@ -35,7 +35,6 @@ my ($template, $loggedinuser, $cookie) = get_template_and_user({
     template_name => 'serials/subscription-batchedit.tt',
     query => $cgi,
     type => 'intranet',
-    authnotrequired => 0,
     flagsrequired => {serials => 'edit_subscription'},
 });
 
diff --git a/serials/subscription-bib-search.pl b/serials/subscription-bib-search.pl
index c6ff67d428..148fd27bde 100755
--- a/serials/subscription-bib-search.pl
+++ b/serials/subscription-bib-search.pl
@@ -83,7 +83,6 @@ if ( $op eq "do_search" && $query ) {
             template_name   => "serials/result.tt",
             query           => $input,
             type            => "intranet",
-            authnotrequired => 0,
             flagsrequired   => { catalogue => 1, serials => '*' },
             debug           => 1,
         }
@@ -192,7 +191,6 @@ else {
             template_name   => "serials/subscription-bib-search.tt",
             query           => $input,
             type            => "intranet",
-            authnotrequired => 0,
             flagsrequired   => { catalogue => 1, serials => '*' },
             debug           => 1,
         }
diff --git a/serials/subscription-detail.pl b/serials/subscription-detail.pl
index b7137bdbc7..40e4cd9709 100755
--- a/serials/subscription-detail.pl
+++ b/serials/subscription-detail.pl
@@ -59,7 +59,6 @@ my ($template, $loggedinuser, $cookie)
 = get_template_and_user({template_name => "serials/subscription-detail.tt",
                 query => $query,
                 type => "intranet",
-                authnotrequired => 0,
                 flagsrequired => {serials => $permission},
                 debug => 1,
                 });
diff --git a/serials/subscription-frequencies.pl b/serials/subscription-frequencies.pl
index f3c6d572d3..51f84a207f 100755
--- a/serials/subscription-frequencies.pl
+++ b/serials/subscription-frequencies.pl
@@ -41,7 +41,6 @@ my ($template, $loggedinuser, $cookie, $flags) = get_template_and_user( {
     template_name   => 'serials/subscription-frequencies.tt',
     query           => $input,
     type            => 'intranet',
-    authnotrequired => 0,
     flagsrequired   => { 'serials' => 1 },
     debug           => 1,
 } );
diff --git a/serials/subscription-history.pl b/serials/subscription-history.pl
index 8934cf1c06..084468c564 100755
--- a/serials/subscription-history.pl
+++ b/serials/subscription-history.pl
@@ -43,7 +43,6 @@ my ($template, $loggedinuser, $cookie, $flags) = get_template_and_user( {
     template_name   => 'serials/subscription-history.tt',
     query           => $input,
     type            => 'intranet',
-    authnotrequired => 0,
     flagsrequired   => { 'serials' => 'edit_subscription' },
     debug           => 1,
 } );
diff --git a/serials/subscription-numberpatterns.pl b/serials/subscription-numberpatterns.pl
index 2bcce3a077..673acbecca 100755
--- a/serials/subscription-numberpatterns.pl
+++ b/serials/subscription-numberpatterns.pl
@@ -40,7 +40,6 @@ my ($template, $loggedinuser, $cookie, $flags) = get_template_and_user( {
     template_name   => 'serials/subscription-numberpatterns.tt',
     query           => $input,
     type            => 'intranet',
-    authnotrequired => 0,
     flagsrequired   => { 'serials' => 1 }
 } );
 
diff --git a/serials/subscription-renew.pl b/serials/subscription-renew.pl
index ccfbad2916..47ae72b9fc 100755
--- a/serials/subscription-renew.pl
+++ b/serials/subscription-renew.pl
@@ -67,7 +67,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         template_name   => "serials/subscription-renew.tt",
         query           => $query,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { serials => 'renew_subscription' },
         debug           => 1,
     }
diff --git a/serials/viewalerts.pl b/serials/viewalerts.pl
index 39539e1172..23a0a7d95c 100755
--- a/serials/viewalerts.pl
+++ b/serials/viewalerts.pl
@@ -32,7 +32,6 @@ my ($template, $loggedinuser, $cookie)
     = get_template_and_user({template_name => 'serials/viewalerts.tt',
                  query => $input,
                  type => "intranet",
-                 authnotrequired => 0,
                  flagsrequired => {serials => '*'},
                  debug => 1,
                  });
diff --git a/svc/convert_report b/svc/convert_report
index eb2999011d..36c8b9948b 100755
--- a/svc/convert_report
+++ b/svc/convert_report
@@ -33,7 +33,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         template_name   => "reports/convert_report.tt",
         query           => $query,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { reports => 'execute_reports' },
     }
 );
diff --git a/svc/letters/preview b/svc/letters/preview
index 2d0c73faeb..11c3d1843a 100644
--- a/svc/letters/preview
+++ b/svc/letters/preview
@@ -35,7 +35,6 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
         template_name   => "tools/preview_letter.tt",
         query           => $input,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { tools => 'edit_notices' },
         debug           => 1,
     }
diff --git a/svc/mana/search b/svc/mana/search
index 836e6b2adb..16b8ab6fdf 100755
--- a/svc/mana/search
+++ b/svc/mana/search
@@ -49,7 +49,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         template_name   => $templatename,
         query           => $input,
         type            => "intranet",
-        authnotrequired => 0,
 
         # flagsrequired   => { serials => $permission },
         flagsrequired => { serials => 'create_subscription' },
diff --git a/svc/members/search b/svc/members/search
index 27c0f675ad..1451264c28 100755
--- a/svc/members/search
+++ b/svc/members/search
@@ -35,7 +35,6 @@ my ($template, $user, $cookie) = get_template_and_user({
     template_name   => scalar $input->param('template_path'),
     query           => $input,
     type            => "intranet",
-    authnotrequired => 0,
     flagsrequired   => { borrowers => 'edit_borrowers' }
 });
 
diff --git a/svc/records/preview b/svc/records/preview
index e4855c7672..643fb62fd3 100755
--- a/svc/records/preview
+++ b/svc/records/preview
@@ -46,7 +46,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user({
     template_name   => "catalogue/showmarc.tt",
     query           => $query,
     type            => "intranet",
-    authnotrequired => 1,
 });
 
 $template->param( MARC_FORMATTED => $record->as_formatted );
diff --git a/svc/report b/svc/report
index d16485d4c0..0ab8fb5dcb 100755
--- a/svc/report
+++ b/svc/report
@@ -45,7 +45,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         template_name   => "intranet-main.tt",
         query           => $query,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { catalogue => 1, },
     }
 );
diff --git a/svc/virtualshelves/search b/svc/virtualshelves/search
index 0c827c081b..a180476ffa 100755
--- a/svc/virtualshelves/search
+++ b/svc/virtualshelves/search
@@ -16,7 +16,6 @@ my ($template, $user, $cookie) = get_template_and_user({
     template_name   => scalar $input->param('template_path'),
     query           => $input,
     type            => "intranet",
-    authnotrequired => 0,
     flagsrequired   => { catalogue => 1 }
 });
 
diff --git a/t/Context.t b/t/Context.t
index ea26ac755e..125ea35a5b 100755
--- a/t/Context.t
+++ b/t/Context.t
@@ -18,7 +18,7 @@
 use Modern::Perl;
 
 use DBI;
-use Test::More tests => 28;
+use Test::More tests => 34;
 use Test::MockModule;
 use Test::Warn;
 use YAML;
@@ -104,3 +104,19 @@ is(C4::Context->interface, 'opac', 'interface still opac');
 is( C4::Context->interface( 'SiP' ), 'sip', 'interface SiP' );
 is( C4::Context->interface( 'COMMANDLINE' ), 'commandline', 'interface commandline uc' );
 is( C4::Context->interface( 'CRON' ), 'cron', 'interface cron uc' );
+
+{
+    local %ENV = %ENV;
+    delete $ENV{HTTPS};
+    is( C4::Context->https_enabled, 0, "Undefined HTTPS env returns 0");
+    $ENV{HTTPS} = '1';
+    is( C4::Context->https_enabled, 0, "Invalid 1 HTTPS env returns 0");
+    $ENV{HTTPS} = 'off';
+    is( C4::Context->https_enabled, 0, "off HTTPS env returns 0");
+    $ENV{HTTPS} = 'OFF';
+    is( C4::Context->https_enabled, 0, "OFF HTTPS env returns 0");
+    $ENV{HTTPS} = 'on';
+    is( C4::Context->https_enabled, 1, "on HTTPS env returns 1");
+    $ENV{HTTPS} = 'ON';
+    is( C4::Context->https_enabled, 1, "ON HTTPS env returns 1");
+}
diff --git a/t/db_dependent/Koha/Patron.t b/t/db_dependent/Koha/Patron.t
index 7d5c8574e7..7bda40436d 100644
--- a/t/db_dependent/Koha/Patron.t
+++ b/t/db_dependent/Koha/Patron.t
@@ -19,7 +19,7 @@
 
 use Modern::Perl;
 
-use Test::More tests => 3;
+use Test::More tests => 4;
 use Test::Exception;
 
 use Koha::Database;
@@ -173,3 +173,26 @@ subtest 'login_attempts tests' => sub {
 
     $schema->storage->txn_rollback;
 };
+
+subtest 'is_superlibrarian() tests' => sub {
+
+    plan tests => 2;
+
+    $schema->storage->txn_begin;
+
+    my $patron = $builder->build_object(
+        {
+            class => 'Koha::Patrons',
+            value => {
+                flags => 16
+            }
+        }
+    );
+
+    ok( !$patron->is_superlibrarian, 'Patron is not a superlibrarian and the method returns the correct value' );
+
+    $patron->flags(1)->store->discard_changes;
+    ok( $patron->is_superlibrarian, 'Patron is a superlibrarian and the method returns the correct value' );
+
+    $schema->storage->txn_rollback;
+};
diff --git a/t/db_dependent/Search/History.t b/t/db_dependent/Search/History.t
index 2e3aa1fd1e..c1eaa383f2 100644
--- a/t/db_dependent/Search/History.t
+++ b/t/db_dependent/Search/History.t
@@ -441,7 +441,6 @@ my ( $template, $loggedinuser, $cookies ) = get_template_and_user(
         template_name   => "opac-user.tt",
         query           => $query,
         type            => "opac",
-        authnotrequired => 0,
         debug           => 1
     }
 );
@@ -467,7 +466,6 @@ $result = $schema->resultset('SearchHistory')->search()->count;
         template_name   => "opac-user.tt",
         query           => $query,
         type            => "opac",
-        authnotrequired => 0,
         debug           => 1
     }
 );
diff --git a/t/db_dependent/api/v1/patrons.t b/t/db_dependent/api/v1/patrons.t
index b8037d05b1..cc48b72700 100644
--- a/t/db_dependent/api/v1/patrons.t
+++ b/t/db_dependent/api/v1/patrons.t
@@ -222,14 +222,14 @@ subtest 'update() tests' => sub {
     $schema->storage->txn_rollback;
 
     subtest 'librarian access tests' => sub {
-        plan tests => 22;
+        plan tests => 42;
 
         $schema->storage->txn_begin;
 
         my $authorized_patron = $builder->build_object(
             {
                 class => 'Koha::Patrons',
-                value => { flags => 2**4 } # borrowers flag = 4
+                value => { flags => 1 }
             }
         );
         my $password = 'thePassword123';
@@ -330,6 +330,69 @@ subtest 'update() tests' => sub {
         is(Koha::Patrons->find( $patron_2->id )->cardnumber,
            $newpatron->{ cardnumber }, 'Patron is really updated!');
 
+        my $superlibrarian = $builder->build_object(
+            {
+                class => 'Koha::Patrons',
+                value => { flags => 1 }
+            }
+        );
+
+        $newpatron->{cardnumber} = $superlibrarian->cardnumber;
+        $newpatron->{userid}     = $superlibrarian->userid;
+        $newpatron->{email}      = 'nosense@no.no';
+        # delete RO attributes
+        delete $newpatron->{patron_id};
+        delete $newpatron->{restricted};
+        delete $newpatron->{anonymized};
+
+        # attempt to update
+        $authorized_patron->flags( 2**4 )->store; # borrowers flag = 4
+        $t->put_ok( "//$userid:$password@/api/v1/patrons/" . $superlibrarian->borrowernumber => json => $newpatron )
+          ->status_is(403, "Non-superlibrarian user change of superlibrarian email forbidden")
+          ->json_is( { error => "Not enough privileges to change a superlibrarian's email" } );
+
+        # attempt to unset
+        $newpatron->{email} = undef;
+        $t->put_ok( "//$userid:$password@/api/v1/patrons/" . $superlibrarian->borrowernumber => json => $newpatron )
+          ->status_is(403, "Non-superlibrarian user change of superlibrarian email to undefined forbidden")
+          ->json_is( { error => "Not enough privileges to change a superlibrarian's email" } );
+
+        $newpatron->{email}           = $superlibrarian->email;
+        $newpatron->{secondary_email} = 'nonsense@no.no';
+
+        # attempt to update
+        $t->put_ok( "//$userid:$password@/api/v1/patrons/" . $superlibrarian->borrowernumber => json => $newpatron )
+          ->status_is(403, "Non-superlibrarian user change of superlibrarian secondary_email forbidden")
+          ->json_is( { error => "Not enough privileges to change a superlibrarian's email" } );
+
+        # attempt to unset
+        $newpatron->{secondary_email} = undef;
+        $t->put_ok( "//$userid:$password@/api/v1/patrons/" . $superlibrarian->borrowernumber => json => $newpatron )
+          ->status_is(403, "Non-superlibrarian user change of superlibrarian secondary_email to undefined forbidden")
+          ->json_is( { error => "Not enough privileges to change a superlibrarian's email" } );
+
+        $newpatron->{secondary_email}  = $superlibrarian->emailpro;
+        $newpatron->{altaddress_email} = 'nonsense@no.no';
+
+        # attempt to update
+        $t->put_ok( "//$userid:$password@/api/v1/patrons/" . $superlibrarian->borrowernumber => json => $newpatron )
+          ->status_is(403, "Non-superlibrarian user change of superlibrarian altaddress_email forbidden")
+          ->json_is( { error => "Not enough privileges to change a superlibrarian's email" } );
+
+        # attempt to unset
+        $newpatron->{altaddress_email} = undef;
+        $t->put_ok( "//$userid:$password@/api/v1/patrons/" . $superlibrarian->borrowernumber => json => $newpatron )
+          ->status_is(403, "Non-superlibrarian user change of superlibrarian altaddress_email to undefined forbidden")
+          ->json_is( { error => "Not enough privileges to change a superlibrarian's email" } );
+
+        # update patron without sending email
+        delete $newpatron->{email};
+        delete $newpatron->{secondary_email};
+        delete $newpatron->{altaddress_email};
+        $t->put_ok( "//$userid:$password@/api/v1/patrons/" . $superlibrarian->borrowernumber => json => $newpatron )
+          ->status_is(200, "Non-superlibrarian user can edit superlibrarian successfully if not changing email");
+#  ->json_is( { error => "Not enough privileges to change a superlibrarian's email" } );
+
         $schema->storage->txn_rollback;
     };
 };
diff --git a/tags/list.pl b/tags/list.pl
index 4bcc66e138..23a7d8e345 100755
--- a/tags/list.pl
+++ b/tags/list.pl
@@ -43,7 +43,6 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
         query           => $query,
         type            => "intranet",
         debug           => 1,
-        authnotrequired => 0,
         flagsrequired   => $needed_flags,
     }
 );
diff --git a/tags/review.pl b/tags/review.pl
index 43718fc408..57e30153f1 100755
--- a/tags/review.pl
+++ b/tags/review.pl
@@ -83,7 +83,6 @@ my ($template, $borrowernumber, $cookie) = get_template_and_user(
         query           => $input,
         type            => "intranet",
         debug           => 1,
-        authnotrequired => 0,
         flagsrequired   => $needed_flags,
     }
 );
diff --git a/tools/access_files.pl b/tools/access_files.pl
index 668ede8649..e3cd672670 100755
--- a/tools/access_files.pl
+++ b/tools/access_files.pl
@@ -52,7 +52,6 @@ my ($template, $borrowernumber, $cookie)
     = get_template_and_user({template_name => "tools/access_files.tt",
                 query => $input,
                 type => "intranet",
-                authnotrequired => 0,
                 flagsrequired => { tools => 'access_files' },
                 });
 
diff --git a/tools/automatic_item_modification_by_age.pl b/tools/automatic_item_modification_by_age.pl
index 12a1c006e1..cd6a512e6f 100755
--- a/tools/automatic_item_modification_by_age.pl
+++ b/tools/automatic_item_modification_by_age.pl
@@ -51,7 +51,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         template_name   => "tools/automatic_item_modification_by_age.tt",
         query           => $cgi,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { tools => 'items_batchmod' },
     }
 );
diff --git a/tools/batchMod.pl b/tools/batchMod.pl
index 5acfa61fba..803f1b8726 100755
--- a/tools/batchMod.pl
+++ b/tools/batchMod.pl
@@ -70,7 +70,6 @@ my ($template, $loggedinuser, $cookie)
     = get_template_and_user({template_name => $template_name,
                  query => $input,
                  type => "intranet",
-                 authnotrequired => 0,
                  flagsrequired => $template_flag,
                  });
 
diff --git a/tools/batch_delete_records.pl b/tools/batch_delete_records.pl
index 1f0e56a45e..459f52c2de 100755
--- a/tools/batch_delete_records.pl
+++ b/tools/batch_delete_records.pl
@@ -41,7 +41,6 @@ my ($template, $loggedinuser, $cookie) = get_template_and_user({
         template_name => 'tools/batch_delete_records.tt',
         query => $input,
         type => "intranet",
-        authnotrequired => 0,
         flagsrequired => { tools => 'records_batchdel' },
 });
 
diff --git a/tools/batch_record_modification.pl b/tools/batch_record_modification.pl
index 1a82c476c3..e033d3ee0b 100755
--- a/tools/batch_record_modification.pl
+++ b/tools/batch_record_modification.pl
@@ -46,7 +46,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user({
         template_name => 'tools/batch_record_modification.tt',
         query => $input,
         type => "intranet",
-        authnotrequired => 0,
         flagsrequired => { tools => 'records_batchmod' },
 });
 
diff --git a/tools/cleanborrowers.pl b/tools/cleanborrowers.pl
index 3040b1d777..354c3159a9 100755
--- a/tools/cleanborrowers.pl
+++ b/tools/cleanborrowers.pl
@@ -79,7 +79,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {   template_name   => "tools/cleanborrowers.tt",
         query           => $cgi,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { tools => 'delete_anonymize_patrons', catalogue => 1 },
     }
 );
diff --git a/tools/csv-profiles.pl b/tools/csv-profiles.pl
index dd09677676..2ca20f9c08 100755
--- a/tools/csv-profiles.pl
+++ b/tools/csv-profiles.pl
@@ -53,7 +53,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {   template_name   => "tools/csv-profiles.tt",
         query           => $input,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { tools => 'manage_csv_profiles' },
         debug           => 1,
     }
diff --git a/tools/export.pl b/tools/export.pl
index 0704b57d6d..ed2c160a35 100755
--- a/tools/export.pl
+++ b/tools/export.pl
@@ -61,7 +61,6 @@ my ( $template, $loggedinuser, $cookie, $flags ) = get_template_and_user(
         template_name   => "tools/export.tt",
         query           => $query,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { tools => 'export_catalog' },
         debug           => 1,
     }
diff --git a/tools/holidays.pl b/tools/holidays.pl
index 207439befc..2a9f02dfb2 100755
--- a/tools/holidays.pl
+++ b/tools/holidays.pl
@@ -34,7 +34,6 @@ my ($template, $loggedinuser, $cookie)
     = get_template_and_user({template_name => "tools/holidays.tt",
                              type => "intranet",
                              query => $input,
-                             authnotrequired => 0,
                              flagsrequired => {tools => 'edit_calendar'},
                              debug => 1,
                            });
diff --git a/tools/import_borrowers.pl b/tools/import_borrowers.pl
index 4da2cd0d03..046173500c 100755
--- a/tools/import_borrowers.pl
+++ b/tools/import_borrowers.pl
@@ -73,7 +73,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         template_name   => "tools/import_borrowers.tt",
         query           => $input,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { tools => 'import_patrons' },
         debug           => 1,
     }
diff --git a/tools/inventory.pl b/tools/inventory.pl
index 19d7090ffd..b6b6be142b 100755
--- a/tools/inventory.pl
+++ b/tools/inventory.pl
@@ -62,7 +62,6 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
     {   template_name   => "tools/inventory.tt",
         query           => $input,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { tools => 'inventory' },
         debug           => 1,
     }
diff --git a/tools/koha-news.pl b/tools/koha-news.pl
index b90a8c4521..8db653fe5d 100755
--- a/tools/koha-news.pl
+++ b/tools/koha-news.pl
@@ -59,7 +59,6 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
         template_name   => "tools/koha-news.tt",
         query           => $cgi,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { tools => 'edit_news' },
         debug           => 1,
     }
diff --git a/tools/letter.pl b/tools/letter.pl
index 2c5481e6cd..3ab03f257a 100755
--- a/tools/letter.pl
+++ b/tools/letter.pl
@@ -76,7 +76,6 @@ our ( $template, $borrowernumber, $cookie, $staffflags ) = get_template_and_user
         template_name   => 'tools/letter.tt',
         query           => $input,
         type            => 'intranet',
-        authnotrequired => 0,
         flagsrequired   => { tools => 'edit_notices' },
         debug           => 1,
     }
diff --git a/tools/manage-marc-import.pl b/tools/manage-marc-import.pl
index 6f9405d281..04c62e267c 100755
--- a/tools/manage-marc-import.pl
+++ b/tools/manage-marc-import.pl
@@ -53,7 +53,6 @@ my ($template, $loggedinuser, $cookie)
     = get_template_and_user({template_name => "tools/manage-marc-import.tt",
                  query => $input,
                  type => "intranet",
-                 authnotrequired => 0,
                  flagsrequired => {tools => 'manage_staged_marc'},
                  debug => 1,
                  });
diff --git a/tools/marc_modification_templates.pl b/tools/marc_modification_templates.pl
index f88f7d5de0..aa31611710 100755
--- a/tools/marc_modification_templates.pl
+++ b/tools/marc_modification_templates.pl
@@ -35,7 +35,6 @@ my ($template, $loggedinuser, $cookie)
             template_name => "tools/marc_modification_templates.tt",
             query => $cgi,
             type => "intranet",
-            authnotrequired => 0,
             flagsrequired => { tools => 'marc_modification_templates' },
             debug => 1,
     });
diff --git a/tools/modborrowers.pl b/tools/modborrowers.pl
index 96c19ebb94..afd7cbff35 100755
--- a/tools/modborrowers.pl
+++ b/tools/modborrowers.pl
@@ -47,7 +47,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {   template_name   => "tools/modborrowers.tt",
         query           => $input,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { tools => "edit_patrons" },
     }
 );
diff --git a/tools/overduerules.pl b/tools/overduerules.pl
index 616f6070ea..720a0605fa 100755
--- a/tools/overduerules.pl
+++ b/tools/overduerules.pl
@@ -62,7 +62,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         template_name   => "tools/overduerules.tt",
         query           => $input,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { tools => 'edit_notice_status_triggers' },
         debug           => 1,
     }
diff --git a/tools/picture-upload.pl b/tools/picture-upload.pl
index e349f5a432..0ea2b762fa 100755
--- a/tools/picture-upload.pl
+++ b/tools/picture-upload.pl
@@ -47,7 +47,6 @@ my ($template, $loggedinuser, $cookie)
     = get_template_and_user({template_name => "tools/picture-upload.tt",
 					query => $input,
 					type => "intranet",
-					authnotrequired => 0,
 					flagsrequired => { tools => 'batch_upload_patron_images'},
 					debug => 0,
 					});
diff --git a/tools/quotes-upload.pl b/tools/quotes-upload.pl
index 833942217f..a065da0943 100755
--- a/tools/quotes-upload.pl
+++ b/tools/quotes-upload.pl
@@ -34,7 +34,6 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
         template_name   => "tools/quotes-upload.tt",
         query           => $cgi,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { tools => 'edit_quotes' },
         debug           => 1,
     }
diff --git a/tools/quotes.pl b/tools/quotes.pl
index 4781d2965a..6ac4371542 100755
--- a/tools/quotes.pl
+++ b/tools/quotes.pl
@@ -34,7 +34,6 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
         template_name   => "tools/quotes.tt",
         query           => $cgi,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { tools => 'edit_quotes' },
         debug           => 1,
     }
diff --git a/tools/scheduler.pl b/tools/scheduler.pl
index 3cf6b7e7fc..05778e21cc 100755
--- a/tools/scheduler.pl
+++ b/tools/scheduler.pl
@@ -49,7 +49,6 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
         template_name   => "tools/scheduler.tt",
         query           => $input,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { tools => 'schedule_tasks' },
         debug           => 1,
     }
diff --git a/tools/showdiffmarc.pl b/tools/showdiffmarc.pl
index f8219aa3b6..35156eb788 100755
--- a/tools/showdiffmarc.pl
+++ b/tools/showdiffmarc.pl
@@ -55,7 +55,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         template_name   => "tools/showdiffmarc.tt",
         query           => $input,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { tools => 'manage_staged_marc' },
         debug           => 1,
     }
diff --git a/tools/stage-marc-import.pl b/tools/stage-marc-import.pl
index d76c35ac18..81ea7ab615 100755
--- a/tools/stage-marc-import.pl
+++ b/tools/stage-marc-import.pl
@@ -66,7 +66,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         template_name   => "tools/stage-marc-import.tt",
         query           => $input,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { tools => 'stage_marc_import' },
         debug           => 1,
     }
diff --git a/tools/stockrotation.pl b/tools/stockrotation.pl
index a5a064a334..e456e92933 100755
--- a/tools/stockrotation.pl
+++ b/tools/stockrotation.pl
@@ -55,7 +55,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
             tools => '*',
             stockrotation => '*',
         },
-        authnotrequired => 0
     }
 );
 
diff --git a/tools/tools-home.pl b/tools/tools-home.pl
index 99fde6391d..a0f7832f6a 100755
--- a/tools/tools-home.pl
+++ b/tools/tools-home.pl
@@ -29,7 +29,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         template_name   => "tools/tools-home.tt",
         query           => $query,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { tools => '*' },
         debug           => 1,
     }
diff --git a/tools/upload-cover-image.pl b/tools/upload-cover-image.pl
index ff89afb1d6..3df6b7f50c 100755
--- a/tools/upload-cover-image.pl
+++ b/tools/upload-cover-image.pl
@@ -59,7 +59,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         template_name   => "tools/upload-images.tt",
         query           => $input,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { tools => 'upload_local_cover_images' },
         debug           => 0,
     }
diff --git a/tools/upload.pl b/tools/upload.pl
index afb7c516f9..61e8a22ee4 100755
--- a/tools/upload.pl
+++ b/tools/upload.pl
@@ -41,7 +41,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {   template_name   => "tools/upload.tt",
         query           => $input,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { tools => 'upload_general_files' },
     }
 );
diff --git a/tools/viewlog.pl b/tools/viewlog.pl
index eb1a6900a4..9c2141eb2f 100755
--- a/tools/viewlog.pl
+++ b/tools/viewlog.pl
@@ -67,7 +67,6 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
         template_name   => "tools/viewlog.tt",
         query           => $input,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { tools => 'view_system_logs' },
         debug           => 1,
     }
diff --git a/virtualshelves/addbybiblionumber.pl b/virtualshelves/addbybiblionumber.pl
index a60c88fd53..8d43ab9439 100755
--- a/virtualshelves/addbybiblionumber.pl
+++ b/virtualshelves/addbybiblionumber.pl
@@ -87,7 +87,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {   template_name   => "virtualshelves/addbybiblionumber.tt",
         query           => $query,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { catalogue => 1 },
     }
 );
diff --git a/virtualshelves/downloadshelf.pl b/virtualshelves/downloadshelf.pl
index b8b37fb4a2..6d788d91f8 100755
--- a/virtualshelves/downloadshelf.pl
+++ b/virtualshelves/downloadshelf.pl
@@ -40,7 +40,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user (
         template_name   => "virtualshelves/downloadshelf.tt",
         query           => $query,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { catalogue => 1 },
     }
 );
diff --git a/virtualshelves/sendshelf.pl b/virtualshelves/sendshelf.pl
index 0103df3e71..4ee9e46863 100755
--- a/virtualshelves/sendshelf.pl
+++ b/virtualshelves/sendshelf.pl
@@ -40,7 +40,6 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
         template_name   => "virtualshelves/sendshelfform.tt",
         query           => $query,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { catalogue => 1 },
     }
 );
@@ -64,7 +63,6 @@ if ($email) {
         template_name   => "virtualshelves/sendshelf.tt",
         query           => $query,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { catalogue => 1 },
         }
     );
diff --git a/virtualshelves/shelves.pl b/virtualshelves/shelves.pl
index 6665c91c2a..e6e84fd79c 100755
--- a/virtualshelves/shelves.pl
+++ b/virtualshelves/shelves.pl
@@ -43,7 +43,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {   template_name   => "virtualshelves/shelves.tt",
         query           => $query,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { catalogue => 1 },
     }
 );