diff --git a/app/assets/javascripts/discourse/dialects/dialect.js b/app/assets/javascripts/discourse/dialects/dialect.js
index 3fe570c2d25..9a5b6ce976e 100644
--- a/app/assets/javascripts/discourse/dialects/dialect.js
+++ b/app/assets/javascripts/discourse/dialects/dialect.js
@@ -5,7 +5,7 @@
 
   To extend the dialect, you can register a handler, and you will receive an `event` object
   with a handle to the markdown `Dialect` from Markdown.js that we are defining. Here's
-  a sample dialect that replaces all occurances of "evil trout" with a link that says
+  a sample dialect that replaces all occurrences of "evil trout" with a link that says
   "EVIL TROUT IS AWESOME":
 
   ```javascript
diff --git a/app/assets/javascripts/discourse/dialects/onebox_dialect.js b/app/assets/javascripts/discourse/dialects/onebox_dialect.js
index f99e9583d08..4c4ebd38986 100644
--- a/app/assets/javascripts/discourse/dialects/onebox_dialect.js
+++ b/app/assets/javascripts/discourse/dialects/onebox_dialect.js
@@ -49,6 +49,9 @@ Discourse.Dialect.on("parseNode", function(event) {
     return;
   }
 
+  // We don't onebox mentions
+  if (node[1]['class'] === 'mention') { return; }
+
   // Don't onebox links within a list
   for (var i=0; i<path.length; i++) {
     if (path[i][0] === 'li') { return; }
diff --git a/test/javascripts/components/markdown_test.js b/test/javascripts/components/markdown_test.js
index 8bea0094cd2..e0840812ffc 100644
--- a/test/javascripts/components/markdown_test.js
+++ b/test/javascripts/components/markdown_test.js
@@ -116,7 +116,10 @@ test("Quotes", function() {
 });
 
 test("Mentions", function() {
-  cookedOptions("Hello @sam", { mentionLookup: (function() { return true; }) },
+
+  var alwaysTrue = { mentionLookup: (function() { return true; }) };
+
+  cookedOptions("Hello @sam", alwaysTrue,
                 "<p>Hello <a class=\"mention\" href=\"/users/sam\">@sam</a></p>",
                 "translates mentions to links");
 
@@ -162,6 +165,10 @@ test("Mentions", function() {
          "<ol><li><p>this is  a list</p></li><li><p>this is an <span class=\"mention\">@eviltrout</span> mention  </p></li></ol>",
          "it mentions properly in a list.");
 
+  cookedOptions("@eviltrout", alwaysTrue,
+                "<p><a class=\"mention\" href=\"/users/eviltrout\">@eviltrout</a></p>",
+                "it doesn't onebox mentions");
+
 });
 
 test("Oneboxing", function() {