diff --git a/mod/glossary/formats/TEMPLATE/TEMPLATE_format.php b/mod/glossary/formats/TEMPLATE/TEMPLATE_format.php
index 1346b875b2b..edc5e6c16b3 100755
--- a/mod/glossary/formats/TEMPLATE/TEMPLATE_format.php
+++ b/mod/glossary/formats/TEMPLATE/TEMPLATE_format.php
@@ -23,7 +23,10 @@ function glossary_show_entry_TEMPLATE($course, $cm, $glossary, $entry, $mode='',
 
         //Use this code to show author's name
         //Comments: Configuration not supported
-        echo '<span class="author">'.$strby.' '.fullname($user, isteacher($course->id)) . '<br />';
+        $fullname = fullname($user, isteacher($course->id));
+        $by->name = '<a href="'.$CFG->wwwroot.'/user/view.php?id='.$user->id.'&amp;course='.$course->id.'">'.$fullname.'</a>';
+        $by->date = userdate($entry->timemodified);
+        echo '<span class="author">'.get_string('bynameondate', 'forum', $by).'</span>' . '<br />';
 
         //Use this code to show modification date
         //Comments: Configuration not supported
diff --git a/mod/glossary/formats/encyclopedia/encyclopedia_format.php b/mod/glossary/formats/encyclopedia/encyclopedia_format.php
index 7720e1bf8bc..00438384daa 100644
--- a/mod/glossary/formats/encyclopedia/encyclopedia_format.php
+++ b/mod/glossary/formats/encyclopedia/encyclopedia_format.php
@@ -20,9 +20,12 @@ function glossary_show_entry_encyclopedia($course, $cm, $glossary, $entry, $mode
         echo '<span class="concept">';
         glossary_print_entry_concept($entry);
         echo '</span><br />';
-        echo '<span class="author">'.$strby.' '.fullname($user, isteacher($course->id)).'</span>';
-        echo '&nbsp;&nbsp;<span class="time">('.get_string('lastedited').': '.
-             userdate($entry->timemodified).')</span>';
+
+        $fullname = fullname($user, isteacher($course->id));
+        $by->name = '<a href="'.$CFG->wwwroot.'/user/view.php?id='.$user->id.'&amp;course='.$course->id.'">'.$fullname.'</a>';
+        $by->date = userdate($entry->timemodified);
+        echo '<span class="author">'.get_string('bynameondate', 'forum', $by).'</span>';
+
         echo '</td>';
         
         echo '<td class="entryapproval">';
diff --git a/mod/glossary/formats/fullwithauthor/fullwithauthor_format.php b/mod/glossary/formats/fullwithauthor/fullwithauthor_format.php
index c226a96d08e..c9050f305c5 100644
--- a/mod/glossary/formats/fullwithauthor/fullwithauthor_format.php
+++ b/mod/glossary/formats/fullwithauthor/fullwithauthor_format.php
@@ -22,9 +22,11 @@ function glossary_show_entry_fullwithauthor($course, $cm, $glossary, $entry, $mo
         glossary_print_entry_concept($entry);
         echo '</span><br />';
 
-        echo '<span class="author">'.$strby.' '.fullname($user, isteacher($course->id));
-        echo '&nbsp;&nbsp;('.get_string('lastedited').': '.
-             userdate($entry->timemodified).')</span>';
+        $fullname = fullname($user, isteacher($course->id));
+        $by->name = '<a href="'.$CFG->wwwroot.'/user/view.php?id='.$user->id.'&amp;course='.$course->id.'">'.$fullname.'</a>';
+        $by->date = userdate($entry->timemodified);
+        echo '<span class="author">'.get_string('bynameondate', 'forum', $by).'</span>';
+
         echo '</td>';
         echo '<td class="entryattachment">';