diff --git a/public/src/forum/topic.js b/public/src/forum/topic.js
index e9d7f814cd..7bead051dd 100644
--- a/public/src/forum/topic.js
+++ b/public/src/forum/topic.js
@@ -537,7 +537,8 @@ define(['composer'], function(composer) {
 
 
 		socket.on('get_users_in_room', function(data) {
-			if(data) {
+
+			if(data && data.room.indexOf('topic') !== -1) {
 				var activeEl = $('.thread_active_users');
 
 				function createUserIcon(uid, picture, userslug, username) {
diff --git a/src/socket.io/index.js b/src/socket.io/index.js
index c9657afd95..993b9bb8ed 100644
--- a/src/socket.io/index.js
+++ b/src/socket.io/index.js
@@ -94,7 +94,11 @@ Sockets.init = function() {
 					});
 				}
 
-				io.sockets.in('global').emit('user.isOnline', isUserOnline(uid));
+				socket.broadcast.emit('user.isOnline', null, {
+					online: isUserOnline(uid),
+					uid: uid,
+					timestamp: Date.now()
+				});
 			});
 		});
 
@@ -114,7 +118,11 @@ Sockets.init = function() {
 				}
 			}
 
-			io.sockets.in('global').emit('user.isOnline', isUserOnline(uid));
+			socket.broadcast.emit('user.isOnline', null, {
+				online: isUserOnline(uid),
+				uid: uid,
+				timestamp: Date.now()
+			});
 
 			emitOnlineUserCount();
 
@@ -190,7 +198,6 @@ Sockets.emitUserCount = function() {
 	});
 };
 
-// Use sessionData.server.sockets.in() instead of this method.
 Sockets.in = function(room) {
 	return io.sockets.in(room);
 };
@@ -239,15 +246,15 @@ function updateRoomBrowsingText(roomName) {
 	var	uids = getUidsInRoom(Sockets.rooms[roomName]),
 		anonymousCount = getAnonymousCount(roomName);
 
-	if (uids.length === 0) {
-		io.sockets.in(roomName).emit('get_users_in_room', { users: [], anonymousCount: anonymousCount });
-	} else {
-		user.getMultipleUserFields(uids, ['uid', 'username', 'userslug', 'picture'], function(err, users) {
-			if(!err) {
-				io.sockets.in(roomName).emit('get_users_in_room', { users: users, anonymousCount: anonymousCount });
-			}
-		});
-	}
+	user.getMultipleUserFields(uids, ['uid', 'username', 'userslug', 'picture'], function(err, users) {
+		if(!err) {
+			io.sockets.in(roomName).emit('get_users_in_room', {
+				users: users,
+				anonymousCount: anonymousCount,
+				room: roomName
+			});
+		}
+	});
 }
 
 Sockets.emitTopicPostStats = emitTopicPostStats;