diff --git a/public/src/forum/account.js b/public/src/forum/account.js
index 10ec2cd3b9..0b49d71cb4 100644
--- a/public/src/forum/account.js
+++ b/public/src/forum/account.js
@@ -85,7 +85,7 @@ define(['forum/accountheader'], function(header) {
 		});
 	};
 
-	Account.handleUserOnline = function(data) {
+	Account.handleUserOnline = function(err, data) {
 		var onlineStatus = $('.account-online-status');
 
 		if (data.online) {
diff --git a/public/src/forum/accountedit.js b/public/src/forum/accountedit.js
index 1f80904a3f..d12b98f634 100644
--- a/public/src/forum/accountedit.js
+++ b/public/src/forum/accountedit.js
@@ -36,7 +36,7 @@ define(['forum/accountheader', 'uploader'], function(header, uploader) {
 						gravatarPicture = data.gravatarpicture;
 					}
 				} else {
-					app.alertError('There was an error updating your profile! ' + err.error);
+					app.alertError('There was an error updating your profile! ' + err.message);
 				}
 			});
 			return false;
@@ -186,7 +186,7 @@ define(['forum/accountheader', 'uploader'], function(header, uploader) {
 						passwordvalid = false;
 
 						if (err) {
-							app.alertError(err.error);
+							app.alertError(err.message);
 							return;
 						}
 
@@ -206,9 +206,9 @@ define(['forum/accountheader', 'uploader'], function(header, uploader) {
 			type: type
 		};
 
-		socket.emit('user.changePicture', userData, function(success) {
-			if (!success) {
-				app.alertError('There was an error changing picture!');
+		socket.emit('user.changePicture', userData, function(err) {
+			if(err) {
+				app.alertError(err.message);
 			}
 		});
 	}
diff --git a/public/src/forum/users.js b/public/src/forum/users.js
index 72f58fd17d..611c71436f 100644
--- a/public/src/forum/users.js
+++ b/public/src/forum/users.js
@@ -80,7 +80,7 @@ define(function() {
 			}, 250);
 		});
 
-		socket.on('user.isOnline', function(data) {
+		socket.on('user.isOnline', function(err, data) {
 			if(getActiveSection() == 'online' && !loadingMoreUsers) {
 				startLoading('users:online', 0, true);
 				socket.emit('user.getOnlineAnonCount', {} , function(anonCount) {
diff --git a/public/src/modules/chat.js b/public/src/modules/chat.js
index 3efb695d66..68bb927523 100644
--- a/public/src/modules/chat.js
+++ b/public/src/modules/chat.js
@@ -90,7 +90,7 @@ define(['taskbar', 'string'], function(taskbar, S) {
 	}
 
 	function checkStatus(chatModal, callback) {
-		socket.emit('user.isOnline', chatModal.touid, function(data) {
+		socket.emit('user.isOnline', chatModal.touid, function(err, data) {
 			if(data.online !== chatModal.online) {
 				if(data.online) {
 					module.appendChatMessage(chatModal, chatModal.username + ' is currently online.\n', data.timestamp);
diff --git a/src/socket.io/user.js b/src/socket.io/user.js
index 8d4e8b3da4..6a4d1f4382 100644
--- a/src/socket.io/user.js
+++ b/src/socket.io/user.js
@@ -33,7 +33,7 @@ SocketUser.reset.commit = function(socket, data, callback) {
 };
 
 SocketUser.isOnline = function(socket, uid, callback) {
-	callback({
+	callback(null, {
 		online: module.parent.exports.isUserOnline(uid),
 		uid: uid,
 		timestamp: Date.now()
@@ -54,29 +54,31 @@ SocketUser.changePicture = function(socket, data, callback) {
 
 	function updateHeader() {
 		user.getUserFields(socket.uid, ['picture'], function(err, fields) {
-			if (!err && fields) {
+			if(err) {
+				return callback(err);
+			}
+
+			if (fields) {
 				fields.uid = socket.uid;
-				socket.emit('meta.updateHeader', fields);
-				callback(true);
-			} else {
-				callback(false);
+				socket.emit('meta.updateHeader', null, fields);
 			}
+
+			callback(null);
 		});
 	}
 
 	if (type === 'gravatar') {
-		user.getUserField(socket.uid, 'gravatarpicture', function(err, gravatar) {
-			user.setUserField(socket.uid, 'picture', gravatar);
-			updateHeader();
-		});
+		type = 'gravatarpicture';
 	} else if (type === 'uploaded') {
-		user.getUserField(socket.uid, 'uploadedpicture', function(err, uploadedpicture) {
-			user.setUserField(socket.uid, 'picture', uploadedpicture);
-			updateHeader();
-		});
+		type = 'uploadedpicture';
 	} else {
-		callback(false);
+		return callback(new Error('invalid-image-type'));
 	}
+
+	user.getUserField(socket.uid, type, function(err, picture) {
+		user.setUserField(socket.uid, 'picture', picture);
+		updateHeader();
+	});
 };
 
 SocketUser.follow = function(socket, data, callback) {
diff --git a/src/user.js b/src/user.js
index da0257b870..47f60cd88e 100644
--- a/src/user.js
+++ b/src/user.js
@@ -347,13 +347,11 @@ var bcrypt = require('bcrypt'),
 
 	User.changePassword = function(uid, data, callback) {
 		if (!utils.isPasswordValid(data.newPassword)) {
-			return callback({
-				error: 'Invalid password!'
-			});
+			return callback(new Error('Invalid password!'));
 		}
 
-		User.getUserField(uid, 'password', function(err, user_password) {
-			bcrypt.compare(data.currentPassword, user_password, function(err, res) {
+		User.getUserField(uid, 'password', function(err, currentPassword) {
+			bcrypt.compare(data.currentPassword, currentPassword, function(err, res) {
 				if (err) {
 					return callback(err);
 				}
@@ -365,9 +363,7 @@ var bcrypt = require('bcrypt'),
 						callback(null);
 					});
 				} else {
-					callback({
-						error: 'Your current password is not correct!'
-					});
+					callback(new Error('Your current password is not correct!'));
 				}
 			});
 		});