diff --git a/mod/glossary/comment.php b/mod/glossary/comment.php
index 99c423a868d..3a0f76249c4 100644
--- a/mod/glossary/comment.php
+++ b/mod/glossary/comment.php
@@ -47,7 +47,8 @@ function glossary_comment_add() {
 
     require_login($course->id, false, $cm);
     $context = get_context_instance(CONTEXT_MODULE, $cm->id);
-    if (!$glossary->allowcomments and !has_capability('mod/glossary:comment', $context)) {
+    /// Both the configuration and capability must allow comments
+    if (!$glossary->allowcomments or !has_capability('mod/glossary:comment', $context)) {
         error('You can\'t add comments to this glossary!');
     }
 
diff --git a/mod/glossary/lib.php b/mod/glossary/lib.php
index 07b5a216516..2793d9ba147 100644
--- a/mod/glossary/lib.php
+++ b/mod/glossary/lib.php
@@ -833,7 +833,7 @@ function glossary_print_entry_icons($course, $cm, $glossary, $entry, $mode='',$h
     }
     $return .= glossary_print_entry_commentslink($course, $cm, $glossary, $entry,$mode,$hook,'html');
 
-    if (has_capability('mod/glossary:comment', $context)) {
+    if (has_capability('mod/glossary:comment', $context) and $glossary->allowcomments) {
         $output = true;
         $return .= ' <a title="' . get_string('addcomment','glossary') . '" href="comment.php?action=add&amp;eid='.$entry->id.'"><img src="comment.gif" class="iconsmall" alt="'.get_string('addcomment','glossary').'" /></a>';
     }