diff --git a/src/database/mongo/hash.js b/src/database/mongo/hash.js
index 65157d8cb9..8a833699f9 100644
--- a/src/database/mongo/hash.js
+++ b/src/database/mongo/hash.js
@@ -39,14 +39,14 @@ module.exports = function(db, module) {
 			return callback(null, []);
 		}
 		db.collection('objects').find({_key: {$in: keys}}, {_id: 0}).toArray(function(err, data) {
-			if(err) {
+			if (err) {
 				return callback(err);
 			}
 
 			var map = helpers.toMap(data);
 			var returnData = [];
 
-			for(var i=0; i<keys.length; ++i) {
+			for (var i=0; i<keys.length; ++i) {
 				returnData.push(map[keys[i]]);
 			}
 
diff --git a/src/posts/edit.js b/src/posts/edit.js
index efec4c7918..518cbe5763 100644
--- a/src/posts/edit.js
+++ b/src/posts/edit.js
@@ -78,8 +78,8 @@ module.exports = function(Posts) {
 		var title = data.title.trim();
 
 		async.parallel({
-			cid: function(next) {
-				topics.getTopicField(tid, 'cid', next);
+			topic: function(next) {
+				topics.getTopicFields(tid, ['cid', 'title'], next);
 			},
 			isMain: function(next) {
 				Posts.isMain(data.pid, next);
@@ -92,14 +92,15 @@ module.exports = function(Posts) {
 			if (!results.isMain) {
 				return callback(null, {
 					tid: tid,
-					cid: results.cid,
-					isMainPost: false
+					cid: results.topic.cid,
+					isMainPost: false,
+					renamed: false
 				});
 			}
 
 			var topicData = {
 				tid: tid,
-				cid: results.cid,
+				cid: results.topic.cid,
 				uid: postData.uid,
 				mainPid: data.pid
 			};
@@ -131,11 +132,13 @@ module.exports = function(Posts) {
 					plugins.fireHook('action:topic.edit', topicData);
 					next(null, {
 						tid: tid,
-						cid: results.cid,
+						cid: results.topic.cid,
 						uid: postData.uid,
 						title: validator.escape(title),
+						oldTitle: results.topic.title,
 						slug: topicData.slug,
-						isMainPost: results.isMain,
+						isMainPost: true,
+						renamed: title !== results.topic.title,
 						tags: tags
 					});
 				}
diff --git a/src/socket.io/posts.js b/src/socket.io/posts.js
index 7d37379807..2fcb00dc97 100644
--- a/src/socket.io/posts.js
+++ b/src/socket.io/posts.js
@@ -303,6 +303,16 @@ SocketPosts.edit = function(socket, data, callback) {
 			return callback(err);
 		}
 
+		if (result.topic.renamed) {
+			events.log({
+				type: 'topic-rename',
+				uid: socket.uid,
+				ip: socket.ip,
+				oldTitle: result.topic.oldTitle,
+				newTitle: result.topic.title
+			});
+		}
+
 		if (parseInt(result.post.deleted) !== 1) {
 			websockets.in('topic_' + result.topic.tid).emit('event:post_edited', result);
 			return callback(null, result.post);