diff --git a/discord/ext/commands/bot.py b/discord/ext/commands/bot.py
index 3f4fa34dc..9192fac1c 100644
--- a/discord/ext/commands/bot.py
+++ b/discord/ext/commands/bot.py
@@ -49,6 +49,9 @@ def _get_variable(name):
 def when_mentioned(bot, msg):
     """A callable that implements a command prefix equivalent
     to being mentioned, e.g. ``@bot ``."""
+    server = msg.server
+    if server is not None:
+        return '{0.me.mention} '.format(server)
     return '{0.user.mention} '.format(bot)
 
 def when_mentioned_or(*prefixes):
@@ -67,7 +70,7 @@ def when_mentioned_or(*prefixes):
     """
     def inner(bot, msg):
         r = list(prefixes)
-        r.append('{0.user.mention} '.format(bot))
+        r.append(when_mentioned(bot, msg))
         return r
 
     return inner