diff --git a/src/categories.js b/src/categories.js
index ab4a91cdad..65f61731ac 100644
--- a/src/categories.js
+++ b/src/categories.js
@@ -398,7 +398,7 @@ var db = require('./database.js'),
 
 	Categories.moveActiveUsers = function(tid, oldCid, cid, callback) {
 		function updateUser(uid) {
-			Categories.addActiveUser(cid, uid);
+			Categories.addActiveUser(cid, uid, Date.now());
 			Categories.isUserActiveIn(oldCid, uid, function(err, active) {
 
 				if (!err && !active) {
diff --git a/src/socket.io/topics.js b/src/socket.io/topics.js
index c9eba84a5d..c597fc88db 100644
--- a/src/socket.io/topics.js
+++ b/src/socket.io/topics.js
@@ -177,8 +177,8 @@ SocketTopics.movePost = function(data, callback, sessionData) {
 	});
 };
 
-SocketTopics.move = function(data, sessionData) {
-	threadTools.move(data.tid, data.cid, sessionData.socket);
+SocketTopics.move = function(data, callback, sessionData) {
+	threadTools.move(data.tid, data.cid, callback, sessionData);
 };
 
 SocketTopics.followCheck = function(tid, callback, sessionData) {
diff --git a/src/threadTools.js b/src/threadTools.js
index c5c0f9e647..97e0811596 100644
--- a/src/threadTools.js
+++ b/src/threadTools.js
@@ -167,8 +167,7 @@ var winston = require('winston'),
 		}
 	}
 
-	ThreadTools.move = function(tid, cid, socket) {
-
+	ThreadTools.move = function(tid, cid, callback, sessionData) {
 		topics.getTopicFields(tid, ['cid', 'lastposttime'], function(err, topicData) {
 			var oldCid = topicData.cid;
 
@@ -176,10 +175,9 @@ var winston = require('winston'),
 				db.sortedSetAdd('categories:' + cid + ':tid', topicData.lastposttime, tid, function(err, result) {
 
 					if(err) {
-						socket.emit('api:topic.move', {
+						return callback({
 							status: 'error'
 						});
-						return;
 					}
 
 					topics.setTopicField(tid, 'cid', cid);
@@ -199,11 +197,11 @@ var winston = require('winston'),
 					categories.incrementCategoryFieldBy(oldCid, 'topic_count', -1);
 					categories.incrementCategoryFieldBy(cid, 'topic_count', 1);
 
-					socket.emit('api:topic.move', {
+					callback({
 						status: 'ok'
 					});
 
-					websockets.in('topic_' + tid).emit('event:topic_moved', {
+					sessionData.server.sockets.in('topic_' + tid).emit('event:topic_moved', {
 						tid: tid
 					});
 				});