diff --git a/src/posts.js b/src/posts.js
index bd29294bcb..7e3b87d9bc 100644
--- a/src/posts.js
+++ b/src/posts.js
@@ -495,7 +495,7 @@ var db = require('./database'),
 		});
 	}
 
-	Posts.getPidPage = function(pid, callback) {
+	Posts.getPidPage = function(pid, uid, callback) {
 		Posts.getPostField(pid, 'tid', function(err, tid) {
 			if(err) {
 				return callback(err);
@@ -510,11 +510,15 @@ var db = require('./database'),
 				if(index === -1) {
 					return callback(new Error('pid not found'));
 				}
-				var postsPerPage = parseInt(meta.config.postsPerPage, 10);
-				postsPerPage = postsPerPage ? postsPerPage : 20;
 
-				var page = Math.ceil((index + 1) / postsPerPage);
-				callback(null, page);
+				user.getSettings(uid, function(err, settings) {
+					if(err) {
+						return callback(err);
+					}
+
+					var page = Math.ceil((index + 1) / settings.postsPerPage);
+					callback(null, page);
+				});
 			});
 		});
 	}
diff --git a/src/socket.io/posts.js b/src/socket.io/posts.js
index f8fc4b33c8..07e51546e7 100644
--- a/src/socket.io/posts.js
+++ b/src/socket.io/posts.js
@@ -228,7 +228,7 @@ SocketPosts.getFavouritedUsers = function(socket, pid, callback) {
 };
 
 SocketPosts.getPidPage = function(socket, pid, callback) {
-	posts.getPidPage(pid, callback);
+	posts.getPidPage(pid, socket.uid, callback);
 }
 
 SocketPosts.flag = function(socket, pid, callback) {