diff --git a/public/src/client/topic/browsing.js b/public/src/client/topic/browsing.js
index dd768391e1..935439fa88 100644
--- a/public/src/client/topic/browsing.js
+++ b/public/src/client/topic/browsing.js
@@ -9,10 +9,10 @@ define('forum/topic/browsing', function() {
 	var Browsing = {};
 
 	Browsing.onUpdateUsersInRoom = function(data) {
-		if(data && data.room.indexOf('topic_' + ajaxify.variables.get('topic_id')) !== -1) {
+		if (data && data.room.indexOf('topic_' + ajaxify.variables.get('topic_id')) !== -1) {
 			$('.browsing-users').toggleClass('hidden', !data.users.length);
 			for(var i=0; i<data.users.length; ++i) {
-				addUserIcon(data.users[i]);
+				addUserIcon(data.users[i]);	
 			}
 
 			updateUserCount(data.total);
@@ -32,8 +32,10 @@ define('forum/topic/browsing', function() {
 	};
 
 	Browsing.onUserLeave = function(uid) {
-		var activeEl = $('.thread_active_users');
-		var user = activeEl.find('a[data-uid="' + uid + '"]');
+		if (app.user.uid === parseInt(uid, 10)) {
+			return;
+		}
+		var user = $('.thread_active_users').find('a[data-uid="' + uid + '"]');
 		if (user.length) {
 			var count = Math.max(0, parseInt(user.attr('data-count'), 10) - 1);
 			user.attr('data-count', count);
diff --git a/src/socket.io/index.js b/src/socket.io/index.js
index 98d1d6e2e8..aed324d520 100644
--- a/src/socket.io/index.js
+++ b/src/socket.io/index.js
@@ -278,9 +278,10 @@ Sockets.getUsersInRoom = function (uid, roomName, callback) {
 	var	uids = Sockets.getUidsInRoom(roomName);
 	var total = uids.length;
 	uids = uids.slice(0, 9);
-	if (uid) {
+	if (uid && uids.indexOf(uid.toString()) === -1) {
 		uids = [uid].concat(uids);
 	}
+
 	if (!uids.length) {
 		return callback(null, {users: [], total: 0 , room: roomName});
 	}