diff --git a/main/glossary/index.php b/main/glossary/index.php
index 3dee76f303..60723212d5 100755
--- a/main/glossary/index.php
+++ b/main/glossary/index.php
@@ -90,12 +90,12 @@ switch ($action) {
             $form->addHtmlEditor(
                 'name',
                 get_lang('TermName'),
-                false,
+                true,
                 false,
                 ['ToolbarSet' => 'TitleAsHtml']
             );
         } else {
-            $form->addElement('text', 'name', get_lang('TermName'), ['id' => 'glossary_title']);
+            $form->addText('name', get_lang('TermName'), true, ['id' => 'glossary_title']);
         }
 
         $form->addHtmlEditor(
@@ -107,7 +107,6 @@ switch ($action) {
         );
         $form->addButtonCreate(get_lang('TermAddButton'), 'SubmitGlossary');
         // setting the rules
-        $form->addRule('name', get_lang('ThisFieldIsRequired'), 'required');
         // The validation or display
         if ($form->validate()) {
             $check = Security::check_token('post');
@@ -154,12 +153,12 @@ switch ($action) {
                 $form->addHtmlEditor(
                     'name',
                     get_lang('TermName'),
-                    false,
+                    true,
                     false,
                     ['ToolbarSet' => 'TitleAsHtml']
                 );
             } else {
-                $form->addElement('text', 'name', get_lang('TermName'), ['id' => 'glossary_title']);
+                $form->addText('name', get_lang('TermName'), true, ['id' => 'glossary_title']);
             }
 
             $form->addHtmlEditor(
@@ -192,9 +191,6 @@ switch ($action) {
             $form->addButtonUpdate(get_lang('TermUpdateButton'), 'SubmitGlossary');
             $form->setDefaults($glossary_data);
 
-            // setting the rules
-            $form->addRule('name', get_lang('ThisFieldIsRequired'), 'required');
-
             // The validation or display
             if ($form->validate()) {
                 $check = Security::check_token('post');
diff --git a/main/inc/lib/TrackingCourseLog.php b/main/inc/lib/TrackingCourseLog.php
index 8db8e3b67c..4c1b462b11 100644
--- a/main/inc/lib/TrackingCourseLog.php
+++ b/main/inc/lib/TrackingCourseLog.php
@@ -284,6 +284,8 @@ class TrackingCourseLog
                     $row[4] = $ip;
                 }
 
+                $row[5] = Security::remove_XSS($row[5]);
+
                 $resources[] = $row;
             }
         }