diff --git a/CHANGELOG b/CHANGELOG
index 75d88e2..2a025d6 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,7 +1,10 @@
-v6.7.2
+v 6.8.0
+  - Ability to at mention users that are participating in issue and merge req. discussion
+
+v 6.7.2
   - Fix upgrader script
 
-v6.7.1
+v 6.7.1
   - Fix GitLab CI integration
 
 v 6.7.0
diff --git a/lib/gitlab/markdown.rb b/lib/gitlab/markdown.rb
index 1d3c6ac..de14a3e 100644
--- a/lib/gitlab/markdown.rb
+++ b/lib/gitlab/markdown.rb
@@ -167,7 +167,7 @@ module Gitlab
 
     def reference_user(identifier)
       if user = User.find_by_username(identifier)
-        link_to("@#{identifier}", user_url(identifier), html_options.merge(class: "gfm gfm-team_member #{html_options[:class]}")) if user
+        link_to("@#{identifier}", user_url(identifier), html_options.merge(class: "gfm gfm-team_member #{html_options[:class]}"))
       end
     end
 
--
libgit2 0.21.2