diff --git a/lang/en_utf8/chat.php b/lang/en_utf8/chat.php
index c3aa3d62748..ca5a09a0d73 100644
--- a/lang/en_utf8/chat.php
+++ b/lang/en_utf8/chat.php
@@ -5,6 +5,7 @@ $string['ajax'] = 'Version using Ajax';
 $string['autoscroll'] = 'Auto Scroll';
 $string['beep'] = 'beep';
 $string['cantlogin'] = 'Could not log in to chat room!!';
+$string['chatadministration'] = 'Chat Administration';
 $string['chat:chat'] = 'Access a chat room';
 $string['chat:deletelog'] = 'Delete chat logs';
 $string['chat:exportsession'] = 'Export chat session';
diff --git a/lib/navigationlib.php b/lib/navigationlib.php
index fdad94b4295..78c604acd1d 100644
--- a/lib/navigationlib.php
+++ b/lib/navigationlib.php
@@ -67,6 +67,8 @@ class navigation_node {
     const TYPE_CUSTOM =     60;
     /**  Setting node type, used only within settings nav */
     const TYPE_SETTING =    70;
+    /**  Setting node type, used only within settings nav */
+    const TYPE_USER =    80;
 
     /** @var int Parameter to aid the coder in tracking [optional] */
     public $id = null;
@@ -109,7 +111,7 @@ class navigation_node {
     /** @var bool If set to true a title will be added to the action no matter what */
     public $forcetitle = false;
     /** @var array */
-    protected $namedtypes = array(0=>'system',10=>'category',20=>'course',30=>'structure',40=>'activity',50=>'resource',60=>'custom',70=>'setting');
+    protected $namedtypes = array(0=>'system',10=>'category',20=>'course',30=>'structure',40=>'activity',50=>'resource',60=>'custom',70=>'setting', 80=>'user');
     /** @var moodle_url */
     protected static $fullmeurl = null;
 
@@ -390,16 +392,20 @@ class navigation_node {
              $title = $this->title;
         }
 
-        if ($content != '' && ((is_object($this->action) && $this->action instanceof moodle_url) || is_string($this->action))) {
-            $link = new html_link();
+        if ($content != '' && ((is_object($this->action) && ($this->action instanceof moodle_url || $this->action instanceof html_link)) || is_string($this->action))) {
+            if (!($this->action instanceof html_link)) {
+                $link = new html_link();
+                $link->url = $this->action;
+                $link->text = clean_text($content);
+            } else {
+                $link = $this->action;
+            }
             if ($title !== '') {
                 $link->title = $title;
             }
             if ($this->hidden) {
                 $link->add_class('dimmed');
             }
-            $link->url = $this->action;
-            $link->text = clean_text($content);
             $content = $OUTPUT->link($link);
         } else {
             if ($title !== '') {
diff --git a/mod/chat/lib.php b/mod/chat/lib.php
index a8921150489..ae50a2d5839 100644
--- a/mod/chat/lib.php
+++ b/mod/chat/lib.php
@@ -1214,3 +1214,79 @@ function chat_supports($feature) {
         default: return null;
     }
 }
+
+function chat_extend_navigation($navigation, $course, $module, $cm) {
+    global $CFG, $USER, $PAGE, $OUTPUT;
+    if (has_capability('mod/chat:chat',$cm->context)) {
+        $strenterchat    = get_string('enterchat', 'chat');
+        $currentgroup = groups_get_activity_group($cm, true);
+
+        $target = $CFG->wwwroot.'/mod/chat/';
+        $params = array('id'=>$cm->instance);
+
+        if ($currentgroup) {
+            $params['groupid'] = $currentgroup;
+        }
+
+        $links = array();
+        
+        if (!empty($USER->screenreader)) {
+            $links[] = html_link::make(new moodle_url($target.'gui_basic/index.php', $params), $strenterchat);
+        } else {
+            $links[] = html_link::make(new moodle_url($target.'gui_'.$CFG->chat_method.'/index.php', $params), $strenterchat);
+        }
+
+        if ($CFG->enableajax) {
+            $links[] = html_link::make(new moodle_url($target.'gui_ajax/index.php', $params), get_string('ajax_gui', 'message'));
+        }
+
+        if ($CFG->chat_method == 'header_js' && empty($USER->screenreader)) {
+            $links[] = html_link::make(new moodle_url($target.'gui_basic/index.php', $params), get_string('noframesjs', 'message'));
+        }
+
+        foreach ($links as $link) {
+            $link->add_action(new popup_action('click', $link->url, 'chat'.$course->id.$cm->instance.$currentgroup, array('height' => 500, 'width' => 700)));
+            $link->title = get_string('modulename', 'chat');
+            $navigation->add($link->title, $link, navigation_node::TYPE_ACTIVITY, null ,null, $OUTPUT->old_icon_url('c/group'));
+        }
+    }
+
+    $chatusers = chat_get_users($cm->instance, $currentgroup, $cm->groupingid);
+    if (is_array($chatusers) && count($chatusers)>0) {
+        $userskey = $navigation->add(get_string('currentusers', 'chat'));
+        $users = $navigation->get($userskey);
+        foreach ($chatusers as $chatuser) {
+            $userlink = new moodle_url($CFG->wwwroot.'/user/view.php', array('id'=>$chatuser->id,'course'=>$course->id));
+            $users->add(fullname($chatuser).' '.format_time(time() - $chatuser->lastmessageping), $userlink, navigation_node::TYPE_USER, null, null, $OUTPUT->old_icon_url('c/user'));
+        }
+    }
+}
+
+function chat_extend_settings_navigation($settingsnav, $module) {
+    global $DB, $PAGE, $USER, $CFG;
+    $chat = $DB->get_record("chat", array("id" => $PAGE->cm->instance));
+    $chatnavkey = $settingsnav->add(get_string('chatadministration', 'chat'));
+    $chatnav = $settingsnav->get($chatnavkey);
+    $chatnav->forceopen = true;
+    if ($chat->chattime && $chat->schedule) {
+        $key = $chatnav->add(get_string('nextsession', 'chat').': '.userdate($chat->chattime).' ('.usertimezone($USER->timezone));
+        $chatnav->get($key)->add_class('note');
+    }
+
+    $currentgroup = groups_get_activity_group($PAGE->cm, true);
+    if ($currentgroup) {
+        $groupselect = " AND groupid = '$currentgroup'";
+    } else {
+        $groupselect = '';
+    }
+
+    if ($chat->studentlogs || has_capability('mod/chat:readlog',$PAGE->cm->context)) {
+        if ($DB->get_records_select('chat_messages', "chatid = ? $groupselect", array($chat->id))) {
+            $chatnav->add(get_string('viewreport', 'chat'), new moodle_url($CFG->wwwroot.'/mod/chat/report.php', array('id'=>$PAGE->cm->id)));
+        }
+    }
+
+    if (has_capability('moodle/course:manageactivities', $PAGE->cm->context)) {
+        $chatnav->add(get_string('updatethis', '', get_string('modulename', 'chat')), new moodle_url($CFG->wwwroot.'/course/mod.php', array('update' => $PAGE->cm->id, 'return' => true, 'sesskey' => sesskey())));
+    }
+}
\ No newline at end of file