diff --git a/ChangeLog b/ChangeLog
index 51c888f9c..5ee2824ea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,5 @@
+	* Added User.list command to list registered users.
+	
 	* Fixed bug #850931 as well as several other minor bugs in
 	Utilities.re.
 	
diff --git a/src/Owner.py b/src/Owner.py
index 26c8c4236..4c895eef3 100644
--- a/src/Owner.py
+++ b/src/Owner.py
@@ -91,7 +91,8 @@ class Owner(privmsgs.CapabilityCheckingPrivmsg):
     def __init__(self):
         callbacks.Privmsg.__init__(self)
         setattr(self.__class__, 'exec', self.__class__._exec)
-        self.defaultPlugins = {'capabilities': 'User',
+        self.defaultPlugins = {'list': 'Misc',
+                               'capabilities': 'User',
                                'addcapability': 'Admin',
                                'removecapability': 'Admin'}
 
diff --git a/src/User.py b/src/User.py
index 443a2c637..d6275b4de 100755
--- a/src/User.py
+++ b/src/User.py
@@ -39,6 +39,7 @@ import fix
 
 import getopt
 import string
+import fnmatch
 from itertools import imap, ifilter
 
 import conf