diff --git a/src/controllers/accounts.js b/src/controllers/accounts.js
index 3aa60f61a5..6a1d4f100e 100644
--- a/src/controllers/accounts.js
+++ b/src/controllers/accounts.js
@@ -23,10 +23,14 @@ var fs = require('fs'),
 
 function getUserDataByUserSlug(userslug, callerUID, callback) {
 	user.getUidByUserslug(userslug, function(err, uid) {
-		if (err || !uid) {
+		if (err) {
 			return callback(err);
 		}
 
+		if (!uid) {
+			return callback(null, null);
+		}
+
 		async.parallel({
 			userData : function(next) {
 				user.getUserData(uid, next);
@@ -347,7 +351,7 @@ accountsController.getBaseUser = function(userslug, callerUID, callback) {
 	});
 };
 
-accountsController.accountEdit = function(req, res, next) {
+accountsController.accountEdit = function(req, res, callback) {
 	var userData;
 	async.waterfall([
 		function(next) {
@@ -355,11 +359,14 @@ accountsController.accountEdit = function(req, res, next) {
 		},
 		function(data, next) {
 			userData = data;
+			if (!userData) {
+				return callback();
+			}
 			db.getObjectField('user:' + userData.uid, 'password', next);
 		}
 	], function(err, password) {
 		if (err) {
-			return next(err);
+			return callback(err);
 		}
 
 		userData.hasPassword = !!password;