diff --git a/app/models/post.rb b/app/models/post.rb
index 21bf9fe7dc3..99ce50dbc3b 100644
--- a/app/models/post.rb
+++ b/app/models/post.rb
@@ -124,9 +124,11 @@ class Post < ActiveRecord::Base
   end
 
   def max_mention_validator
-    max_mentions = SiteSetting.visitor_max_mentions_per_post
-    max_mentions = SiteSetting.max_mentions_per_post if user.present? && user.has_trust_level?(:basic)
-    errors.add(:base, I18n.t(:too_many_mentions, count: max_mentions)) if raw_mentions.size > max_mentions
+    if user.present? && user.has_trust_level?(:basic)
+      errors.add(:base, I18n.t(:too_many_mentions, count: SiteSetting.max_mentions_per_post)) if raw_mentions.size > SiteSetting.max_mentions_per_post
+    else
+      errors.add(:base, I18n.t(:too_many_mentions_visitor, count: SiteSetting.visitor_max_mentions_per_post)) if raw_mentions.size > SiteSetting.visitor_max_mentions_per_post
+    end
   end
 
   def max_images_validator
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index 34cfef735c9..6a13e930067 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -13,6 +13,10 @@ en:
   is_reserved: "is reserved"
 
   too_many_mentions:
+    zero: "Sorry, you can't mention other users."
+    one: "Sorry, you can only mention one other user in a post."
+    other: "Sorry, you can only mention %{count} users in a post."
+  too_many_mentions_visitor:
     zero: "Sorry, visitors can't mention other users."
     one: "Sorry, visitors can only mention one other user in a post."
     other: "Sorry, visitors can only mention %{count} users in a post."