diff --git a/src/user.js b/src/user.js
index c5f84bd2e2..6c68acae1c 100644
--- a/src/user.js
+++ b/src/user.js
@@ -130,8 +130,9 @@ var bcrypt = require('bcryptjs'),
 			}
 
 			if (!results.exists) {
-				return callback(new Error('user-deleted'));
+				return callback(new Error('invalid-user'));
 			}
+
 			var lastposttime = results.lastposttime;
 			if (!lastposttime) {
 				lastposttime = 0;
diff --git a/tests/categories.js b/tests/categories.js
index 1c1e1fac32..a3fa7a4971 100644
--- a/tests/categories.js
+++ b/tests/categories.js
@@ -56,6 +56,6 @@ describe('Categories', function() {
 
 	after(function() {
 		db.delete('category:' + categoryObj.cid);
-		db.listRemoveLast('categories:cid');
+		db.sortedSetRemove('categories:cid', categoryObj.cid);
 	});
 });