diff --git a/modules/users/users.js b/modules/users/users.js
index 2d57193..d08c91f 100644
--- a/modules/users/users.js
+++ b/modules/users/users.js
@@ -38,13 +38,14 @@ var users = function(dbot) {
         var knownUsers = getServerUsers(event.server);
         if(!knownUsers.channelUsers.hasOwnProperty(event.channel.name)) {
             knownUsers.channelUsers[event.channel.name] = [];
+            event.reply('creating new chanusers')
         }
         var channelUsers = knownUsers.channelUsers[event.channel.name];
 
         event.channel.nicks.each(function(nick) {
             nick = nick.name;
             if(api.isKnownUser(event.server, nick)) {
-                nick = api.resolveUser(nick);
+                nick = api.resolveUser(event.server, nick);
             } else {
                 knownUsers.users.push(nick);
             }
@@ -167,7 +168,7 @@ var users = function(dbot) {
                 var channelUsers = knownUsers.channelUsers[event.channel.name];
 
                 if(api.isKnownUser(event.server, nick)) {
-                    nick = api.resolveUser(nick);
+                    nick = api.resolveUser(event.server, nick);
                 } else {
                     knownUsers.users.push(nick);
                 }
diff --git a/modules/users/web.js b/modules/users/web.js
index b6d4ad2..ff7754b 100644
--- a/modules/users/web.js
+++ b/modules/users/web.js
@@ -22,9 +22,24 @@ var pages = function(dbot) {
 
             if(connections.hasOwnProperty(connection) && 
                 connections[connection].channels.hasOwnProperty(channel)) {
-                var nicks = Object.keys(connections[connection].channels[channel].nicks);
+
+                var nicks = dbot.db.knownUsers[connection].channelUsers[channel];
+                var channelUsers = {};
+                for(var i=0;i<nicks.length;i++) {
+                    channelUsers[nicks[i]] = { 'name': nicks[i], 'online': false }; 
+                    console.log(nicks[i]);
+                }
+
+                var channelOnline = dbot.instance.connections[connection].channels[channel].nicks;
+                channelOnline.each(function(nick) {
+                    var nick = dbot.api.users.resolveUser(connection, nick); 
+                    if(channelUsers.hasOwnProperty(nick)) {
+                        channelUsers[nick].online = true;
+                    }
+                }.bind(this));
+
                 res.render('users', { 'name': dbot.config.name, 'connection': connection,
-                    'channel': channel, 'nicks': nicks });
+                    'channel': channel, 'nicks': channelUsers });
             } else {
                 res.render_core('error', { 'name': dbot.config.name, 'message': 'No such connection or channel.' });
             }
diff --git a/views/users/users.jade b/views/users/users.jade
index d20c9e2..e8f5ca1 100644
--- a/views/users/users.jade
+++ b/views/users/users.jade
@@ -1,10 +1,14 @@
 extends ../layout
 
 block content
-    h3 Users currently in #{channel} on #{connection}
+    h3 Users of #{channel} on #{connection}
     div#backlink 
         a(href='/channels/'+connection) &laquo; Channel List
     ul#quotelist
       -each nick in nicks
-        a(href='/user/'+connection+'/'+channel.substr(1,channel.length)+'/'+nick)
-          li.quotes #{nick}
+        if nicks.hasOwnProperty(nick.name)
+          a(href='/user/'+connection+'/'+channel.substr(1,channel.length)+'/'+nick)
+            if nick.online
+              li.quotes #{nick.name} (Online) 
+            else
+              li.quotes #{nick.name} (Offline)