diff --git a/modules/report/report.js b/modules/report/report.js
index e8ec928..471cf32 100644
--- a/modules/report/report.js
+++ b/modules/report/report.js
@@ -140,10 +140,10 @@ var report = function(dbot) {
                             cChan + "\u000f";
                     }
 
-                    _.each(message.match(/@([\d\w\s*|-]+?)/g), function(user) {
+                    _.each(message.match(/ @([\d\w\s*|-]+?)( |$)/g), function(user) {
                         notifier += '[' + colours['nicks'] + user + '\u000f]';
                     });
-                    message = message.replace(/ ( |$)/g, " " + colours['nicks'] +
+                    message = message.replace(/ @([\d\w\s*|-]+?)( |$)/g, " " + colours['nicks'] +
                         "@$1\u000f ");
                 }