diff --git a/mod/chat/gui_ajax/index.php b/mod/chat/gui_ajax/index.php
index c949dc80da0..210fcf87630 100644
--- a/mod/chat/gui_ajax/index.php
+++ b/mod/chat/gui_ajax/index.php
@@ -69,7 +69,7 @@ print_js_config(array('home'=>$CFG->httpswwwroot.'/mod/chat/view.php?id='.$cm->i
 print_js_config(array('send'=>$str_send, 'sending'=>$str_sending, 'inputarea'=>$str_inputarea, 'userlist'=>$str_userlist), 'chat_lang');
 ?>
 <script type="text/javascript" src="<?php echo $CFG->httpswwwroot;?>/lib/yui/yahoo-dom-event/yahoo-dom-event.js"></script>
-<script type="text/javascript" src="<?php echo $CFG->httpswwwroot;?>/lib/yui/element/element-beta-min.js"></script>
+<script type="text/javascript" src="<?php echo $CFG->httpswwwroot;?>/lib/yui/element/element-min.js"></script>
 <script type="text/javascript" src="<?php echo $CFG->httpswwwroot;?>/lib/yui/dragdrop/dragdrop-min.js"></script>
 <script type="text/javascript" src="<?php echo $CFG->httpswwwroot;?>/lib/yui/resize/resize-min.js"></script>
 <script type="text/javascript" src="<?php echo $CFG->httpswwwroot;?>/lib/yui/layout/layout-min.js"></script>
@@ -77,11 +77,11 @@ print_js_config(array('send'=>$str_send, 'sending'=>$str_sending, 'inputarea'=>$
 <script type="text/javascript" src="<?php echo $CFG->httpswwwroot;?>/lib/yui/connection/connection-min.js"></script>
 <script type="text/javascript" src="<?php echo $CFG->httpswwwroot;?>/lib/yui/json/json-min.js"></script>
 <script type="text/javascript" src="<?php echo $CFG->httpswwwroot;?>/lib/yui/button/button-min.js"></script>
-<script type="text/javascript" src="<?php echo $CFG->httpswwwroot;?>/lib/yui/selector/selector-beta-min.js"></script>
+<script type="text/javascript" src="<?php echo $CFG->httpswwwroot;?>/lib/yui/selector/selector-min.js"></script>
 <script type="text/javascript" src="script.js"></script>
 <style type="text/css">
 #listing a{text-decoration:none;color:gray}
-#listing a:hover{text-decoration:underline;color:white;background:blue}
+#listing a:hover {text-decoration:underline;color:white;background:blue}
 #listing{padding: .5em}
 </style>
 </head>
diff --git a/mod/chat/gui_ajax/update.php b/mod/chat/gui_ajax/update.php
index 3ad91792e93..26442f9e926 100755
--- a/mod/chat/gui_ajax/update.php
+++ b/mod/chat/gui_ajax/update.php
@@ -44,9 +44,15 @@ if (!$USER = $DB->get_record('user', array('id'=>$chatuser->userid))) {
     chat_print_error('ERROR', get_string('invaliduserid', 'error'));
 }
 
+if (!$chat = $DB->get_record('chat', array('id'=>$chatuser->chatid))) {
+    chat_print_error('ERROR', get_string('invalidcoursemodule', 'error'));
+}
+
 if (!$cm = get_coursemodule_from_instance('chat', $chatuser->chatid, $course->id)) {
     chat_print_error('ERROR', get_string('invalidcoursemodule', 'error'));
 }
+// setup $PAGE so that format_text will work properly
+$PAGE->set_cm($cm, $course, $chat);
 
 if($CFG->chat_use_cache){
     $cache = new file_cache();