diff --git a/src/main/twirl/gitbucket/core/helper/attached.scala.html b/src/main/twirl/gitbucket/core/helper/attached.scala.html
index 91766f89f..2d3c03f16 100644
--- a/src/main/twirl/gitbucket/core/helper/attached.scala.html
+++ b/src/main/twirl/gitbucket/core/helper/attached.scala.html
@@ -9,6 +9,9 @@
 <script>
 $(function(){
   var emojis = @Html(gitbucket.core.util.EmojiUtil.emojis.map("\"" + _ + "\"").mkString("[", ", ", "]"));
+  var users  = [];
+
+  $.get('@path/_user/proposals', { query: '' }, function (data) { users = data.options; });
 
   $('#@textareaId').textcomplete([
     { // emoji strategy
@@ -26,21 +29,21 @@ $(function(){
         return ':' + value + ': ';
       },
       index: 1
-    }//,
-//    { // tech companies
-//      id: 'tech-companies',
-//      words: ['apple', 'google', 'facebook', 'github'],
-//      match: /\b(\w{2,})$/,
-//      search: function (term, callback) {
-//        callback($.map(this.words, function (word) {
-//          return word.indexOf(term) === 0 ? word : null;
-//        }));
-//      },
-//      index: 1,
-//      replace: function (word) {
-//        return word + ' ';
-//      }
-//    }
+    },
+    { // users
+      id: 'user',
+      //words: users,
+      match: /\B@@([\-+\w]*)$/,
+      search: function (term, callback) {
+        callback($.map(users, function (word) {
+          return word.indexOf(term) === 0 ? word : null;
+        }));
+      },
+      index: 1,
+      replace: function (word) {
+        return '@@' + word + ' ';
+      }
+    }
   ], {
     onKeydown: function (e, commands) {
       if (e.ctrlKey && e.keyCode === 74) { // CTRL-J