diff --git a/public/templates/topic.tpl b/public/templates/topic.tpl
index 597639a6c9..1359100584 100644
--- a/public/templates/topic.tpl
+++ b/public/templates/topic.tpl
@@ -4,7 +4,7 @@
 		<li class="active">{topic_name}</li>
 	</ul>
 
-	<small>psychobunny, null, and 2 guests are browsing this thread</small><br />
+	<div id="thread_active_users"></div><br />
 </div>
 
 <ul id="post-container" class="post-container container">
@@ -38,13 +38,18 @@
 
 
 <script type="text/javascript">
+
 jQuery('document').ready(function() {
-	app.enter_room('global', 'topic_' + '{topic_id}');
+	var room = 'topic_' + '{topic_id}';
+	app.enter_room(room);
 	set_up_posts();
 });
 
 
-ajaxify.register_events(['event:rep_up', 'event:rep_down', 'event:new_post']);
+ajaxify.register_events(['event:rep_up', 'event:rep_down', 'event:new_post', 'api:get_users_in_room']);
+socket.on('api:get_users_in_room', function(users) {
+	document.getElementById('thread_active_users').innerHTML = (users.uids.join(', ')) + ' are browsing this thread';
+});
 
 socket.on('event:rep_up', function(data) {
 	adjust_rep(1, data.pid, data.uid);
@@ -54,6 +59,7 @@ socket.on('event:rep_down', function(data) {
 	adjust_rep(-1, data.pid, data.uid);
 });
 
+
 socket.on('event:new_post', function(data) {
 	var html = templates.prepare(templates['topic'].blocks['posts']).parse(data),
 		uniqueid = new Date().getTime();
@@ -62,6 +68,8 @@ socket.on('event:new_post', function(data) {
 	set_up_posts(uniqueid);
 });
 
+
+
 function adjust_rep(value, pid, uid) {
 	var post_rep = jQuery('.post_rep_' + pid),
 		user_rep = jQuery('.user_rep_' + uid);
@@ -107,11 +115,11 @@ function set_up_posts(div) {
 		
 		if (this.children[1].className == 'icon-star-empty') {
 			this.children[1].className = 'icon-star';
-			socket.emit('api:posts.favourite', {pid: pid, room_id: current_room});
+			socket.emit('api:posts.favourite', {pid: pid, room_id: app.current_room});
 		}
 		else {
 			this.children[1].className = 'icon-star-empty';
-			socket.emit('api:posts.unfavourite', {pid: pid, room_id: current_room});
+			socket.emit('api:posts.unfavourite', {pid: pid, room_id: app.current_room});
 		}
 	});
 }
diff --git a/src/websockets.js b/src/websockets.js
index 019992cf7b..cc899f5836 100644
--- a/src/websockets.js
+++ b/src/websockets.js
@@ -5,7 +5,9 @@ var	SocketIO = require('socket.io').listen(global.server,{log:false}),
 
 (function(io) {
 	var	modules = null,
-			users = {};
+			users = {},
+			rooms = {};
+
 	global.io = io;
 	module.exports.init = function() {
 		modules = global.modules;
@@ -67,13 +69,31 @@ var	SocketIO = require('socket.io').listen(global.server,{log:false}),
    		});
 
 		
-		// BEGIN: API calls (todo: organize)
-		//   julian: :^)
+
 		socket.on('event:enter_room', function(data) {
 			if (data.leave !== null) socket.leave (data.leave);
 			socket.join(data.enter);
+
+			rooms[data.enter] = rooms[data.enter] || {};
+			if (uid) {
+				rooms[data.enter][uid] = true;
+				if (rooms[data.leave]) {
+					delete rooms[data.leave][uid];
+				}
+			} else {
+				rooms[data.enter].anonymous = rooms[data.enter].anonymous ? rooms[data.enter].anonymous + 1 : 1;
+				rooms[data.leave].anonymous = rooms[data.leave].anonymous ? rooms[data.enter].anonymous - 1 : 0;
+			}
+
+			socket.emit('api:get_users_in_room', {
+				uids: Object.keys(rooms[data.enter] || {}),
+				anonymous: rooms[data.enter] ? rooms[data.enter].anonymous : 0
+			});
 		});
 
+		// BEGIN: API calls (todo: organize)
+		//   julian: :^)
+
 		socket.on('api:user.get', function(data) {
 			modules.user.get(socket, uid, data.fields);
 		});