diff --git a/plugins/User/config.py b/plugins/User/config.py
index 758ac70cb..b1c89afa4 100644
--- a/plugins/User/config.py
+++ b/plugins/User/config.py
@@ -43,8 +43,9 @@ def configure(advanced):
 
 
 User = conf.registerPlugin('User')
-# This is where your configuration variables (if any) should go.  For example:
-# conf.registerGlobalValue(User, 'someConfigVariableName',
-#     registry.Boolean(False, """Help for someConfigVariableName."""))
+conf.registerChannelValue(User, 'listInPrivate',
+    registry.Boolean(True, _("""Determines whether the output of 'user list'
+    will be sent in private. This prevents mass-highlights of people who use
+    their nick as their bot username.""")))
 
 # vim:set shiftwidth=4 softtabstop=4 expandtab textwidth=79:
diff --git a/plugins/User/plugin.py b/plugins/User/plugin.py
index 21e5dde58..3671ee78f 100644
--- a/plugins/User/plugin.py
+++ b/plugins/User/plugin.py
@@ -88,7 +88,8 @@ class User(callbacks.Plugin):
                 users.append(u.name)
         if users:
             utils.sortBy(str.lower, users)
-            irc.reply(format('%L', users))
+            private = self.registryValue("listInPrivate", msg.args[0])
+            irc.reply(format('%L', users), private=private)
         else:
             if predicates:
                 irc.reply(_('There are no matching registered users.'))