diff --git a/admin/tool/httpsreplace/index.php b/admin/tool/httpsreplace/index.php
index 4fedae1e36a..8e4abb71303 100644
--- a/admin/tool/httpsreplace/index.php
+++ b/admin/tool/httpsreplace/index.php
@@ -106,7 +106,7 @@ if (!$data = $form->get_data()) {
 
     $progressbar->update_full(100, get_string('complete', 'tool_httpsreplace'));
 
-    echo $OUTPUT->continue_button(new moodle_url('/admin/index.php'));
+    echo $OUTPUT->continue_button(new moodle_url('/admin/settings.php', ['section' => 'httpsecurity']));
 
 }
 echo $OUTPUT->footer();
diff --git a/admin/tool/httpsreplace/settings.php b/admin/tool/httpsreplace/settings.php
index 6ad3d27738b..df9a024cc0e 100644
--- a/admin/tool/httpsreplace/settings.php
+++ b/admin/tool/httpsreplace/settings.php
@@ -28,5 +28,15 @@ if ($hassiteconfig) {
 
     $pluginname = get_string('pluginname', 'tool_httpsreplace');
     $url = $CFG->wwwroot.'/'.$CFG->admin.'/tool/httpsreplace/index.php';
-    $ADMIN->add('security', new admin_externalpage('toolhttpsreplace', $pluginname, $url, 'moodle/site:config'));
+    $ADMIN->add('security', new admin_externalpage('toolhttpsreplace', $pluginname, $url, 'moodle/site:config', true));
+
+    $httpsreplaceurl = $CFG->wwwroot.'/'.$CFG->admin.'/tool/httpsreplace/index.php';
+    $ADMIN->locate('httpsecurity')->add(
+        new admin_setting_heading(
+            'tool_httpsreplaceheader',
+            new lang_string('pluginname', 'tool_httpsreplace'),
+            new lang_string('toolintro', 'tool_httpsreplace', $httpsreplaceurl)
+        )
+    );
+
 }
diff --git a/admin/tool/httpsreplace/tests/behat/httpsreplace.feature b/admin/tool/httpsreplace/tests/behat/httpsreplace.feature
index dba1100136b..9f6052eb7bb 100644
--- a/admin/tool/httpsreplace/tests/behat/httpsreplace.feature
+++ b/admin/tool/httpsreplace/tests/behat/httpsreplace.feature
@@ -13,12 +13,14 @@ Feature: View the httpsreplace report
 
   @javascript
   Scenario: Go to the HTTPS replace report screen. Make sure broken domains are reported.
-    When I navigate to "HTTPS replace" node in "Site administration > Security"
+    When I navigate to "HTTP security" node in "Site administration > Security"
+    And I follow "HTTPS conversion tool"
     Then I should see "intentionally.unavailable"
 
   @javascript
   Scenario: Use the find and replace tool.
-    When I navigate to "HTTPS replace" node in "Site administration > Security"
+    When I navigate to "HTTP security" node in "Site administration > Security"
+    And I follow "HTTPS conversion tool"
     And I set the field "I understand the risks of this operation" to "1"
     And I press "Perform replacement"
     Then I should see "intentionally.unavailable"
diff --git a/lib/classes/plugin_manager.php b/lib/classes/plugin_manager.php
index 75b98b47f1f..7af9689c66a 100644
--- a/lib/classes/plugin_manager.php
+++ b/lib/classes/plugin_manager.php
@@ -1905,7 +1905,7 @@ class core_plugin_manager {
 
             'tool' => array(
                 'analytics', 'assignmentupgrade', 'availabilityconditions', 'behat', 'capability', 'cohortroles', 'customlang',
-                'dbtransfer', 'filetypes', 'generator', 'health', 'innodb', 'installaddon',
+                'dbtransfer', 'filetypes', 'generator', 'health', 'httpsreplace', 'innodb', 'installaddon',
                 'langimport', 'log', 'lp', 'lpimportcsv', 'lpmigrate', 'messageinbound', 'mobile', 'multilangupgrade',
                 'monitor', 'oauth2', 'phpunit', 'profiling', 'recyclebin', 'replace', 'spamcleaner', 'task', 'templatelibrary',
                 'unittest', 'uploadcourse', 'uploaduser', 'unsuproles', 'usertours', 'xmldb'