diff --git a/modules/users/api.js b/modules/users/api.js
index 349e3a2..c523d0b 100644
--- a/modules/users/api.js
+++ b/modules/users/api.js
@@ -41,7 +41,9 @@ var api = function(dbot) {
         },
 
         'getAllUsers': function() {
-            return _.pluck(dbot.db.knownUsers, 'users');
+            return _.reduce(dbot.db.knownUsers, function(memo, function(server, name) {
+                memo[name] = server.users;
+            }, {}, this);
         },
 
         'isKnownUser': function(server, nick) {