diff --git a/badges/action.php b/badges/action.php
index 08f69d7fbc2..929d9a0c819 100644
--- a/badges/action.php
+++ b/badges/action.php
@@ -45,13 +45,14 @@ if ($badge->type == BADGE_TYPE_COURSE) {
     require_login($badge->courseid);
     $navurl = new moodle_url('/badges/index.php', array('type' => $badge->type, 'id' => $badge->courseid));
     $PAGE->set_pagelayout('standard');
+    navigation_node::override_active_url($navurl);
 } else {
     $PAGE->set_pagelayout('admin');
+    navigation_node::override_active_url($navurl, true);
 }
 
 $PAGE->set_context($context);
 $PAGE->set_url('/badges/action.php', array('id' => $badge->id));
-navigation_node::override_active_url($navurl);
 
 if ($return !== 0) {
     $returnurl = new moodle_url($return);
diff --git a/badges/award.php b/badges/award.php
index 0b7afe348e0..9c3db8cd82c 100644
--- a/badges/award.php
+++ b/badges/award.php
@@ -51,8 +51,10 @@ if ($badge->type == BADGE_TYPE_COURSE) {
     require_login($badge->courseid);
     $navurl = new moodle_url('/badges/index.php', array('type' => $badge->type, 'id' => $badge->courseid));
     $PAGE->set_pagelayout('standard');
+    navigation_node::override_active_url($navurl);
 } else {
     $PAGE->set_pagelayout('admin');
+    navigation_node::override_active_url($navurl, true);
 }
 
 require_capability('moodle/badges:awardbadge', $context);
@@ -63,7 +65,6 @@ $PAGE->set_context($context);
 
 // Set up navigation and breadcrumbs.
 $strrecipients = get_string('recipients', 'badges');
-navigation_node::override_active_url($navurl);
 $PAGE->navbar->add($badge->name, new moodle_url('overview.php', array('id' => $badge->id)))->add($strrecipients);
 $PAGE->set_title($strrecipients);
 $PAGE->set_heading($badge->name);
diff --git a/badges/criteria.php b/badges/criteria.php
index 6d20314c65f..ad4b5a614da 100644
--- a/badges/criteria.php
+++ b/badges/criteria.php
@@ -49,8 +49,10 @@ if ($badge->type == BADGE_TYPE_COURSE) {
     require_login($badge->courseid);
     $navurl = new moodle_url('/badges/index.php', array('type' => $badge->type, 'id' => $badge->courseid));
     $PAGE->set_pagelayout('standard');
+    navigation_node::override_active_url($navurl);
 } else {
     $PAGE->set_pagelayout('admin');
+    navigation_node::override_active_url($navurl, true);
 }
 
 $currenturl = new moodle_url('/badges/criteria.php', array('id' => $badge->id));
@@ -59,9 +61,6 @@ $PAGE->set_context($context);
 $PAGE->set_url($currenturl);
 $PAGE->set_heading($badge->name);
 $PAGE->set_title($badge->name);
-
-// Set up navigation and breadcrumbs.
-navigation_node::override_active_url($navurl);
 $PAGE->navbar->add($badge->name);
 
 $output = $PAGE->get_renderer('core', 'badges');
diff --git a/badges/criteria_action.php b/badges/criteria_action.php
index e690296acae..3af69847474 100644
--- a/badges/criteria_action.php
+++ b/badges/criteria_action.php
@@ -49,15 +49,16 @@ if ($badge->type == BADGE_TYPE_COURSE) {
     require_login($badge->courseid);
     $navurl = new moodle_url('/badges/index.php', array('type' => $badge->type, 'id' => $badge->courseid));
     $PAGE->set_pagelayout('standard');
+    navigation_node::override_active_url($navurl);
 } else {
     $PAGE->set_pagelayout('admin');
+    navigation_node::override_active_url($navurl, true);
 }
 
 $PAGE->set_context($context);
 $PAGE->set_url('/badges/criteria_action.php');
 $PAGE->set_heading($badge->name);
 $PAGE->set_title($badge->name);
-navigation_node::override_active_url($navurl);
 
 if ($delete && has_capability('moodle/badges:configurecriteria', $context)) {
     if (!$confirm) {
diff --git a/badges/criteria_settings.php b/badges/criteria_settings.php
index a939a7268c7..32efa615ace 100644
--- a/badges/criteria_settings.php
+++ b/badges/criteria_settings.php
@@ -59,15 +59,16 @@ if ($badge->type == BADGE_TYPE_COURSE) {
     require_login($badge->courseid);
     $navurl = new moodle_url('/badges/index.php', array('type' => $badge->type, 'id' => $badge->courseid));
     $PAGE->set_pagelayout('standard');
+    navigation_node::override_active_url($navurl);
 } else {
     $PAGE->set_pagelayout('admin');
+    navigation_node::override_active_url($navurl, true);
 }
 
 $PAGE->set_context($context);
 $PAGE->set_url('/badges/criteria_settings.php');
 $PAGE->set_heading($badge->name);
 $PAGE->set_title($badge->name);
-navigation_node::override_active_url($navurl);
 $PAGE->navbar->add($badge->name, new moodle_url('overview.php', array('id' => $badge->id)))->add(get_string('criteria_' . $type, 'badges'));
 
 $cparams = array('criteriatype' => $type, 'badgeid' => $badge->id);
diff --git a/badges/edit.php b/badges/edit.php
index fc66b66160a..61e9cc64d1b 100644
--- a/badges/edit.php
+++ b/badges/edit.php
@@ -54,8 +54,10 @@ if ($badge->type == BADGE_TYPE_COURSE) {
     require_login($badge->courseid);
     $navurl = new moodle_url('/badges/index.php', array('type' => $badge->type, 'id' => $badge->courseid));
     $PAGE->set_pagelayout('standard');
+    navigation_node::override_active_url($navurl);
 } else {
     $PAGE->set_pagelayout('admin');
+    navigation_node::override_active_url($navurl, true);
 }
 
 $currenturl = new moodle_url('/badges/edit.php', array('id' => $badge->id, 'action' => $action));
@@ -64,9 +66,6 @@ $PAGE->set_context($context);
 $PAGE->set_url($currenturl);
 $PAGE->set_heading($badge->name);
 $PAGE->set_title($badge->name);
-
-// Set up navigation and breadcrumbs.
-navigation_node::override_active_url($navurl);
 $PAGE->navbar->add($badge->name);
 
 $output = $PAGE->get_renderer('core', 'badges');
diff --git a/badges/index.php b/badges/index.php
index d476cfcdeb6..683b1f9208a 100644
--- a/badges/index.php
+++ b/badges/index.php
@@ -79,7 +79,7 @@ if ($type == BADGE_TYPE_SITE) {
     $PAGE->set_context(context_system::instance());
     $PAGE->set_pagelayout('admin');
     $PAGE->set_heading($title . ': ' . $hdr);
-    navigation_node::override_active_url(new moodle_url('/badges/index.php', array('type' => BADGE_TYPE_SITE)));
+    navigation_node::override_active_url(new moodle_url('/badges/index.php', array('type' => BADGE_TYPE_SITE), true));
 } else {
     require_login($course);
     $coursecontext = context_course::instance($course->id);
diff --git a/badges/overview.php b/badges/overview.php
index cc3376845e7..78016743e1b 100644
--- a/badges/overview.php
+++ b/badges/overview.php
@@ -47,8 +47,10 @@ if ($badge->type == BADGE_TYPE_COURSE) {
     require_login($badge->courseid);
     $navurl = new moodle_url('/badges/index.php', array('type' => $badge->type, 'id' => $badge->courseid));
     $PAGE->set_pagelayout('standard');
+    navigation_node::override_active_url($navurl);
 } else {
     $PAGE->set_pagelayout('admin');
+    navigation_node::override_active_url($navurl, true);
 }
 
 $currenturl = new moodle_url('/badges/overview.php', array('id' => $badge->id));
@@ -57,9 +59,6 @@ $PAGE->set_context($context);
 $PAGE->set_url($currenturl);
 $PAGE->set_heading($badge->name);
 $PAGE->set_title($badge->name);
-
-// Set up navigation and breadcrumbs.
-navigation_node::override_active_url($navurl);
 $PAGE->navbar->add($badge->name);
 
 echo $OUTPUT->header();
diff --git a/badges/recipients.php b/badges/recipients.php
index 83f83f609da..4e77e3d253e 100644
--- a/badges/recipients.php
+++ b/badges/recipients.php
@@ -61,8 +61,10 @@ if ($badge->type == BADGE_TYPE_COURSE) {
     require_login($badge->courseid);
     $navurl = new moodle_url('/badges/index.php', array('type' => $badge->type, 'id' => $badge->courseid));
     $PAGE->set_pagelayout('standard');
+    navigation_node::override_active_url($navurl);
 } else {
     $PAGE->set_pagelayout('admin');
+    navigation_node::override_active_url($navurl, true);
 }
 
 $PAGE->set_context($context);
@@ -70,7 +72,6 @@ $PAGE->set_url('/badges/recipients.php', array('id' => $badgeid, 'sort' => $sort
 $PAGE->set_heading($badge->name);
 $PAGE->set_title($badge->name);
 $PAGE->navbar->add($badge->name);
-navigation_node::override_active_url($navurl);
 
 $output = $PAGE->get_renderer('core', 'badges');