diff --git a/src/socket.io/modules.js b/src/socket.io/modules.js
index 4b33ac952b..ac5980a552 100644
--- a/src/socket.io/modules.js
+++ b/src/socket.io/modules.js
@@ -141,15 +141,19 @@ SocketModules.chats.send = function(socket, data, callback) {
 
 	socket.lastChatMessageTime = now;
 
-	user.getUserField(socket.uid, 'banned', function(err, banned) {
+	user.getUserFields(socket.uid, ['banned', 'email:confirmed'], function(err, userData) {
 		if (err) {
 			return callback(err);
 		}
 
-		if (parseInt(banned, 10) === 1) {
+		if (parseInt(userData.banned, 10) === 1) {
 			return callback(new Error('[[error:user-banned]]'));
 		}
 
+		if (parseInt(meta.config.requireEmailConfirmation, 10) === 1 && parseInt(userData['email:confirmed'], 10) !== 1) {
+			return callback(new Error('[[error:email-not-confirmed]]'));
+		}
+
 		Messaging.canMessage(socket.uid, touid, function(err, allowed) {
 			if (err || !allowed) {
 				return callback(err || new Error('[[error:chat-restricted]]'));
diff --git a/src/user.js b/src/user.js
index ef69c37fc7..3282685473 100644
--- a/src/user.js
+++ b/src/user.js
@@ -175,7 +175,7 @@ var	async = require('async'),
 				return callback(new Error('[[error:user-banned]]'));
 			}
 
-			if (userData.email && parseInt(meta.config.requireEmailConfirmation, 10) === 1 && parseInt(userData['email:confirmed'], 10) !== 1) {
+			if (parseInt(meta.config.requireEmailConfirmation, 10) === 1 && parseInt(userData['email:confirmed'], 10) !== 1) {
 				return callback(new Error('[[error:email-not-confirmed]]'));
 			}
 			var now = Date.now();