diff --git a/modules/users/users.js b/modules/users/users.js
index 7750bab..201f76d 100644
--- a/modules/users/users.js
+++ b/modules/users/users.js
@@ -159,7 +159,7 @@ var users = function(dbot) {
                     dbot.api.event.emit('new_channel_user', [ event.rUser, event.rChannel ]);
                 }
 
-                if(!_.has(event.channel, 'nicks') || !_.has(event.channel.nicks, event.rUser.currentNick)) {
+                if(event.action != 'JOIN' && (!_.has(event.channel, 'nicks') || !_.has(event.channel.nicks, event.rUser.currentNick))) {
                     return done();
                 }
                 var cUser = event.channel.nicks[event.rUser.currentNick];