diff --git a/public/language/en_GB/global.json b/public/language/en_GB/global.json
index 6bb720802f..40b51f3866 100644
--- a/public/language/en_GB/global.json
+++ b/public/language/en_GB/global.json
@@ -60,6 +60,7 @@
 
 	"online": "Online",
 	"away": "Away",
-	"donotdisturb": "Do not disturb",
-	"invisible": "Invisible"
+	"dnd": "Do not disturb",
+	"invisible": "Invisible",
+	"offline": "Offline"
 }
diff --git a/public/src/app.js b/public/src/app.js
index b8ef17422e..1a176fc481 100644
--- a/public/src/app.js
+++ b/public/src/app.js
@@ -268,14 +268,13 @@ var socket,
 		});
 
 		socket.emit('user.getOnlineUsers', uids, function (err, users) {
-			jQuery('button .username-field').each(function (index, element) {
+
+			jQuery('.username-field').each(function (index, element) {
 				var el = jQuery(this),
 					uid = el.parents('li').attr('data-uid');
 
-				if (uid && jQuery.inArray(uid, users) !== -1) {
-					el.parent().addClass('btn-success').removeClass('btn-danger');
-				} else {
-					el.parent().addClass('btn-danger').removeClass('btn-success');
+				if (uid && users[uid]) {
+					el.siblings('i').attr('class', 'fa fa-circle status-' + users[uid].status)
 				}
 			});
 		});
@@ -528,6 +527,14 @@ var socket,
 				$('.navbar-header button').click();
 			}
 		});
+
+		$('#user-control-list .user-status').off('click').on('click', function() {
+			socket.emit('user.setStatus', $(this).attr('data-status'), function(err) {
+				if(err) {
+					return app.alertError(err.message);
+				}
+			});
+		});
 	};
 
 	jQuery('document').ready(function () {
diff --git a/public/src/forum/account.js b/public/src/forum/account.js
index b15613810a..8d85955669 100644
--- a/public/src/forum/account.js
+++ b/public/src/forum/account.js
@@ -84,13 +84,15 @@ define(['forum/accountheader'], function(header) {
 	Account.handleUserOnline = function(err, data) {
 		var onlineStatus = $('.account-online-status');
 
-		if (data.online) {
-			onlineStatus.find('span span').text('online');
-			onlineStatus.find('i').attr('class', 'fa fa-circle');
-		} else {
-			onlineStatus.find('span span').text('offline');
-			onlineStatus.find('i').attr('class', 'fa fa-circle-o');
+		if(parseInt(templates.get('theirid'), 10) !== parseInt(data.uid, 10)) {
+			return;
 		}
+
+		translator.get('global:' + data.status, function(translated) {
+			onlineStatus.find('span span').text(translated);
+			onlineStatus.find('i').attr('class', 'fa fa-circle status-' + data.status);
+		});
+
 	};
 
 	return Account;
diff --git a/public/src/forum/topic.js b/public/src/forum/topic.js
index 2814f8342a..597bbad79f 100644
--- a/public/src/forum/topic.js
+++ b/public/src/forum/topic.js
@@ -570,7 +570,7 @@ define(['composer', 'forum/pagination'], function(composer, pagination) {
 			'event:topic_deleted', 'event:topic_restored', 'event:topic:locked',
 			'event:topic_unlocked', 'event:topic_pinned', 'event:topic_unpinned',
 			'event:topic_moved', 'event:post_edited', 'event:post_deleted', 'event:post_restored',
-			'posts.favourite'
+			'posts.favourite', 'user.isOnline'
 		]);
 
 		socket.on('get_users_in_room', function(data) {
@@ -652,6 +652,11 @@ define(['composer', 'forum/pagination'], function(composer, pagination) {
 					});
 				}
 			}
+
+			app.populateOnlineUsers();
+		});
+
+		socket.on('user.isOnline', function(err, data) {
 			app.populateOnlineUsers();
 		});
 
diff --git a/public/src/modules/chat.js b/public/src/modules/chat.js
index 3cd53a81c3..2eff6a9197 100644
--- a/public/src/modules/chat.js
+++ b/public/src/modules/chat.js
@@ -89,18 +89,9 @@ define(['taskbar', 'string'], function(taskbar, S) {
 		return $('#chat-modal-' + touid).length !== 0;
 	}
 
-	function checkStatus(chatModal, callback) {
+	function checkStatus(chatModal) {
 		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);
-				} else {
-					module.appendChatMessage(chatModal, chatModal.username + ' is currently offline.\n', data.timestamp);
-				}
-				chatModal.online = data.online;
-			}
-			if(callback)
-				callback(data.online);
+			$('#chat-user-status').attr('class', 'fa fa-circle status-' + data.status);
 		});
 	}
 
diff --git a/public/templates/account.tpl b/public/templates/account.tpl
index c457b7fd90..95330af0f8 100644
--- a/public/templates/account.tpl
+++ b/public/templates/account.tpl
@@ -13,7 +13,7 @@
 				<img src="{picture}" class="user-profile-picture img-thumbnail"/>
 			</div>
 			<div class="account-online-status">
-				<span><i class="fa fa-circle-o"></i> <span>[[user:offline]]</span></span>
+				<span><i class="fa fa-circle status-offline"></i> <span>[[user:offline]]</span></span>
 			</div>
 			<!-- IF banned -->
 			<div>
diff --git a/public/templates/chat.tpl b/public/templates/chat.tpl
index 4a34ee5d3e..946fe4054e 100644
--- a/public/templates/chat.tpl
+++ b/public/templates/chat.tpl
@@ -4,7 +4,8 @@
 		<div class="modal-content">
 			<div class="modal-header">
 				<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-				<h4>[[modules:chat.chatting_with]]</h4>
+				<h4>[[modules:chat.chatting_with]] <i id="chat-user-status" class="fa fa-circle status-offline"></i></h4>
+
 			</div>
 			<div class="modal-body">
 				<ul id="chat-content" class="well well-sm"></ul>
diff --git a/public/templates/header.tpl b/public/templates/header.tpl
index 434e1e46ea..9652d0b8bf 100644
--- a/public/templates/header.tpl
+++ b/public/templates/header.tpl
@@ -131,16 +131,16 @@
 							</li>
 							<li role="presentation" class="divider"></li>
 							<li>
-								<a href="#"><i class="fa fa-circle state-online"></i><span> [[global:online]]</span></a>
+								<a href="#" class="user-status" data-status="online"><i class="fa fa-circle status-online"></i><span> [[global:online]]</span></a>
 							</li>
 							<li>
-								<a href="#"><i class="fa fa-circle state-away"></i><span> [[global:away]]</span></a>
+								<a href="#" class="user-status" data-status="away"><i class="fa fa-circle status-away"></i><span> [[global:away]]</span></a>
 							</li>
 							<li>
-								<a href="#"><i class="fa fa-circle state-dnd"></i><span> [[global:donotdisturb]]</span></a>
+								<a href="#" class="user-status" data-status="dnd"><i class="fa fa-circle status-dnd"></i><span> [[global:dnd]]</span></a>
 							</li>
 							<li>
-								<a href="#"><i class="fa fa-circle state-invisible"></i><span> [[global:invisible]]</span></a>
+								<a href="#" class="user-status" data-status="offline"><i class="fa fa-circle status-offline"></i><span> [[global:invisible]]</span></a>
 							</li>
 						</ul>
 					</li>
diff --git a/public/templates/topic.tpl b/public/templates/topic.tpl
index dd4d539786..eb3ad9bab6 100644
--- a/public/templates/topic.tpl
+++ b/public/templates/topic.tpl
@@ -53,6 +53,7 @@
 
 						<div class="btn-group">
 							<button class="btn btn-sm btn-default dropdown-toggle" data-toggle="dropdown" type="button" title="[[topic:posted_by]] {posts.username}">
+								<i class="fa fa-circle status-offline"></i>
 								<span class="visible-xs visible-sm pull-left"><img class="" src="{posts.picture}" width=18 height=18 />&nbsp;</span>
 								<span class="username-field" href="{relative_path}/user/{posts.userslug}" itemprop="author">{posts.username}&nbsp;</span>
 								<span class="caret"></span>
diff --git a/src/socket.io/index.js b/src/socket.io/index.js
index 245c330252..4ad8a60680 100644
--- a/src/socket.io/index.js
+++ b/src/socket.io/index.js
@@ -13,6 +13,7 @@ var	SocketIO = require('socket.io'),
 
 	db = require('../database'),
 	user = require('../user'),
+	socketUser = require('./user'),
 	topics = require('../topics'),
 	logger = require('../logger'),
 	meta = require('../meta'),
@@ -97,10 +98,8 @@ Sockets.init = function(server) {
 					});
 				}
 
-				socket.broadcast.emit('user.isOnline', null, {
-					online: isUserOnline(uid),
-					uid: uid,
-					timestamp: Date.now()
+				socketUser.isOnline(socket, uid, function(err, data) {
+					socket.broadcast.emit('user.isOnline', err, data);
 				});
 			});
 		});
@@ -121,10 +120,8 @@ Sockets.init = function(server) {
 				}
 			}
 
-			socket.broadcast.emit('user.isOnline', null, {
-				online: isUserOnline(uid),
-				uid: uid,
-				timestamp: Date.now()
+			socketUser.isOnline(socket, uid, function(err, data) {
+				socket.broadcast.emit('user.isOnline', err, data);
 			});
 
 			emitOnlineUserCount();
diff --git a/src/socket.io/user.js b/src/socket.io/user.js
index 957ec2c5d5..aeb1270062 100644
--- a/src/socket.io/user.js
+++ b/src/socket.io/user.js
@@ -1,6 +1,6 @@
-var	user = require('../user'),
+var	async = require('async'),
+	user = require('../user'),
 	topics = require('../topics'),
-
 	SocketUser = {};
 
 SocketUser.exists = function(socket, data, callback) {
@@ -45,10 +45,30 @@ SocketUser.reset.commit = function(socket, data, callback) {
 };
 
 SocketUser.isOnline = function(socket, uid, callback) {
-	callback(null, {
-		online: module.parent.exports.isUserOnline(uid),
-		uid: uid,
-		timestamp: Date.now()
+	user.getUserField(uid, 'status', function(err, status) {
+		if(err) {
+			return callback(err);
+		}
+
+		if(!status) {
+			status = 'online';
+		}
+
+		var online = module.parent.exports.isUserOnline(uid);
+		if(!online) {
+			status = 'offline';
+		}
+
+		if(status === 'offline') {
+			online = false;
+		}
+
+		callback(null, {
+			online: online,
+			uid: uid,
+			timestamp: Date.now(),
+			status: status
+		});
 	});
 };
 
@@ -121,19 +141,24 @@ SocketUser.saveSettings = function(socket, data, callback) {
 };
 
 SocketUser.getOnlineUsers = function(socket, data, callback) {
-	var returnData = [];
-	if(data) {
-		for (var i = 0; i < data.length; ++i) {
-			var uid = data[i];
-			if (module.parent.exports.isUserOnline(uid)) {
-				returnData.push(uid);
-			} else {
-				returnData.push(0);
+	var returnData = {};
+	if(!data) {
+		return callback(new Error('invalid-data'));
+	}
+
+	function getUserStatus(uid, next) {
+		SocketUser.isOnline(socket, uid, function(err, data) {
+			if(err) {
+				return next(err);
 			}
-		}
+			returnData[uid] = data;
+			next();
+		});
 	}
 
-	callback(null, returnData);
+	async.each(data, getUserStatus, function(err) {
+		callback(err, returnData);
+	});
 };
 
 SocketUser.getOnlineAnonCount = function(socket, data, callback) {
@@ -165,6 +190,15 @@ SocketUser.loadMore = function(socket, data, callback) {
 	}
 };
 
+SocketUser.setStatus = function(socket, status, callback) {
+	var server = require('./index');
+	user.setUserField(socket.uid, 'status', status, function(err) {
+		SocketUser.isOnline(socket, socket.uid, function(err, data) {
+			server.server.sockets.emit('user.isOnline', err, data);
+		});
+	});
+};
+
 /* Exports */
 
 module.exports = SocketUser;
\ No newline at end of file
diff --git a/src/user.js b/src/user.js
index 76105044a3..71a30aa285 100644
--- a/src/user.js
+++ b/src/user.js
@@ -105,6 +105,7 @@ var bcrypt = require('bcryptjs'),
 					'postcount': 0,
 					'lastposttime': 0,
 					'banned': 0,
+					'status': 'online',
 					'showemail': 0
 				};