diff --git a/lib/navigationlib.php b/lib/navigationlib.php
index <HASH>..<HASH> 100644
--- a/lib/navigationlib.php
+++ b/lib/navigationlib.php
@@ -1879,12 +1879,12 @@ class global_navigation extends navigation_node {
 
     public function get($key, $type = null) {
         $this->initialise();
-        parent::get($key, $type);
+        return parent::get($key, $type);
     }
 
     public function find($key, $type) {
         $this->initialise();
-        parent::find($key, $type);
+        return parent::find($key, $type);
     }
 }
 
@@ -3060,6 +3060,10 @@ class settings_navigation extends navigation_node {
             $key .= $userid;
         }
 
+        if ($this->get('usercurrentsettings'.$userid) || $this->get($key)) {
+            return true;
+        }
+
         // Add a user setting branch
         $usersetting = $this->add(get_string($gstitle, 'moodle', $fullname), null, self::TYPE_CONTAINER, null, $key);
         $usersetting->id = 'usersettings';
navigation MDL-<I> Fixed regression in last commit