diff --git a/src/socket.io/user.js b/src/socket.io/user.js
index 811b9f70dd..f560151512 100644
--- a/src/socket.io/user.js
+++ b/src/socket.io/user.js
@@ -55,6 +55,7 @@ SocketUser.isOnline = function(socket, uid, callback) {
 		}
 
 		var online = module.parent.exports.isUserOnline(uid);
+
 		if(!online) {
 			status = 'offline';
 		}
@@ -204,6 +205,8 @@ SocketUser.loadMore = function(socket, data, callback) {
 	});
 };
 
+
+
 SocketUser.setStatus = function(socket, status, callback) {
 	var server = require('./index');
 	user.setUserField(socket.uid, 'status', status, function(err) {
diff --git a/src/user.js b/src/user.js
index 59836f3867..66fe6b2934 100644
--- a/src/user.js
+++ b/src/user.js
@@ -409,7 +409,7 @@ var bcrypt = require('bcryptjs'),
 			function getUserData(uid, callback) {
 				User.getUserData(uid, function(err, userData) {
 					if(!userData.status) {
-						userData.status = 'offline';
+						userData.status = 'online';
 					}
 
 					User.isAdministrator(uid, function(err, isAdmin) {