diff --git a/C4/Auth.pm b/C4/Auth.pm
index 103bc32a92..2500ce3689 100644
--- a/C4/Auth.pm
+++ b/C4/Auth.pm
@@ -523,7 +523,7 @@ sub get_template_and_user {
             AmazonCoverImages                                                          => C4::Context->preference("AmazonCoverImages"),
             AutoLocation                                                               => C4::Context->preference("AutoLocation"),
             "BiblioDefaultView" . C4::Context->preference("IntranetBiblioDefaultView") => 1,
-            PatronAutoComplete                                                       => C4::Context->preference("PatronAutoComplete"),
+            PatronAutoComplete                                                         => C4::Context->preference("PatronAutoComplete"),
             FRBRizeEditions                                                            => C4::Context->preference("FRBRizeEditions"),
             IndependentBranches                                                        => C4::Context->preference("IndependentBranches"),
             IntranetNav                                                                => C4::Context->preference("IntranetNav"),
@@ -548,6 +548,7 @@ sub get_template_and_user {
             UseCourseReserves                                                          => C4::Context->preference("UseCourseReserves"),
             useDischarge                                                               => C4::Context->preference('useDischarge'),
             pending_checkout_notes                                                     => scalar Koha::Checkouts->search({ noteseen => 0 }),
+            plugins_enabled                                                            => C4::Context->config("enable_plugins"),
         );
     }
     else {
diff --git a/admin/admin-home.pl b/admin/admin-home.pl
index 73f2cc8edf..6595841e70 100755
--- a/admin/admin-home.pl
+++ b/admin/admin-home.pl
@@ -24,7 +24,6 @@ use Koha::Plugins;
 
 my $query = CGI->new;
 
-my $plugins_enabled = C4::Context->config("enable_plugins");
 my $mana_url        = C4::Context->config('mana_config');
 
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
@@ -36,7 +35,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     }
 );
 
-$template->param( plugins_enabled => $plugins_enabled, );
 $template->param( mana_url        => $mana_url, );
 
 output_html_with_http_headers $query, $cookie, $template->output;
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc
index b6992f86d8..590e21ea76 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc
@@ -67,6 +67,13 @@
         </ul>
     [% END %]
 
+    [% IF CAN_user_plugins && plugins_enabled %]
+      <h5>Plugins</h5>
+        <ul>
+            <li><a href="/cgi-bin/koha/plugins/plugins-home.pl">Plugins</a></li>
+        </ul>
+    [% END %]
+
     [% IF CAN_user_parameters_manage_background_jobs %]
         <h5>Background jobs</h5>
         <ul>
@@ -74,7 +81,7 @@
         </ul>
     [% END %]
 
-    [% IF ( CAN_user_parameters_manage_marc_frameworks || CAN_user_parameters_manage_classifications || CAN_user_parameters_manage_matching_rules || CAN_user_parameters_manage_oai_sets || CAN_user_parameters_manage_item_search_fields || CAN_user_parameters_manage_search_engine_config || CAN_user_parameters_manage_marc_overlay_rules ) %]
+    [% IF ( CAN_user_parameters_manage_marc_frameworks || CAN_user_parameters_manage_classifications || CAN_user_parameters_manage_matching_rules || CAN_user_parameters_manage_oai_sets || CAN_user_parameters_manage_item_search_fields || CAN_user_parameters_manage_search_engine_config || CAN_user_parameters_manage_marc_overlay_rules || CAN_user_parameters_manage_marc_overlay_rules ) %]
         <h5>Catalog</h5>
         <ul>
             [% IF ( CAN_user_parameters_manage_marc_frameworks ) %]
@@ -86,11 +93,14 @@
                 <li><a href="/cgi-bin/koha/admin/authtypes.pl">Authority types</a></li>
             [% END %]
             [% IF ( CAN_user_parameters_manage_classifications ) %]
-                <li><a href="/cgi-bin/koha/admin/classsources.pl">Classification sources</a></li>
+                <li><a href="/cgi-bin/koha/admin/classsources.pl">Classification configuration</a></li>
             [% END %]
             [% IF ( CAN_user_parameters_manage_matching_rules ) %]
                 <li><a href="/cgi-bin/koha/admin/matching-rules.pl">Record matching rules</a></li>
             [% END %]
+            [% IF ( CAN_user_parameters_manage_marc_overlay_rules ) %]
+                <li><a href="/cgi-bin/koha/admin/marc-overlay-rules.pl">Record overlay rules</a></li>
+            [% END %]
             [% IF ( CAN_user_parameters_manage_oai_sets ) %]
                 <li><a href="/cgi-bin/koha/admin/oai_sets.pl">OAI sets configuration</a></li>
             [% END %]
@@ -100,15 +110,11 @@
             [% IF ( CAN_user_parameters_manage_search_engine_config ) %]
                 <li><a href="/cgi-bin/koha/admin/searchengine/elasticsearch/mappings.pl">Search engine configuration (Elasticsearch)</a></li>
             [% END %]
-            [% IF ( CAN_user_parameters_manage_marc_overlay_rules ) %]
-                <li><a href="/cgi-bin/koha/admin/marc-overlay-rules.pl">MARC overlay rules</a></li>
-            [% END %]
         </ul>
     [% END %]
 
     [% IF ( CAN_user_acquisition_currencies_manage || CAN_user_acquisition_period_manage || CAN_user_acquisition_budget_manage || CAN_user_acquisition_edi_manage ) %]
         <h5>Acquisition parameters</h5>
-
         <ul>
             [% IF ( CAN_user_acquisition_currencies_manage ) %]
                 <li><a href="/cgi-bin/koha/admin/currency.pl">Currencies and exchange rates</a></li>
@@ -126,13 +132,6 @@
         </ul>
     [% END %]
 
-    [% IF CAN_user_plugins && plugins_enabled %]
-        <h5>Plugins</h5>
-        <ul>
-            <li><a href="/cgi-bin/koha/plugins/plugins-home.pl">Manage plugins</a></li>
-        </ul>
-    [% END %]
-
     [% IF ( CAN_user_parameters_manage_smtp_servers || CAN_user_parameters_manage_search_targets || CAN_user_parameters_manage_didyoumean || CAN_user_parameters_manage_column_config || CAN_user_parameters_manage_audio_alerts || ( CAN_user_parameters_manage_sms_providers && Koha.Preference('SMSSendDriver') == 'Email' ) || CAN_user_parameters_manage_usage_stats || CAN_user_parameters_manage_additional_fields || ( Koha.Preference('EnableAdvancedCatalogingEditor') && CAN_user_parameters_manage_keyboard_shortcuts ) ) %]
         <h5>Additional parameters</h5>
         <ul>