diff --git a/src/user.js b/src/user.js
index 090f4d3758..01f4914bd2 100644
--- a/src/user.js
+++ b/src/user.js
@@ -7,7 +7,7 @@ var bcrypt = require('bcrypt'),
 	userSearch = require('reds').createSearch('nodebbusersearch'),
 	check = require('validator').check,
 	sanitize = require('validator').sanitize,
-	
+
 	utils = require('./../public/src/utils'),
 	RDB = require('./redis'),
 	meta = require('./meta'),
diff --git a/src/websockets.js b/src/websockets.js
index 3f2fb5e4a3..0a6218a492 100644
--- a/src/websockets.js
+++ b/src/websockets.js
@@ -340,8 +340,12 @@ module.exports.init = function(io) {
 			if (uid) {
 				user.setUserFields(uid, {
 					showemail: data.showemail
+				}, function(err, result) {
+					if(err) {
+						return callback(false);
+					}
+					callback(true);
 				});
-				callback(true);
 			}
 		});