diff --git a/public/src/app.js b/public/src/app.js
index be95518b8f..161539c675 100644
--- a/public/src/app.js
+++ b/public/src/app.js
@@ -564,7 +564,9 @@ app.cacheBuster = null;
 				$('[data-uid="' + app.user.uid + '"] [component="user/status"], [component="header/profilelink"] [component="user/status"]')
 					.removeClass('away online dnd offline')
 					.addClass(status);
-
+				$('[component="header/usercontrol"] [data-status]').each(function () {
+					$(this).find('span').toggleClass('bold', $(this).attr('data-status') === status);
+				});
 				app.user.status = status;
 			});
 			e.preventDefault();
diff --git a/src/middleware/header.js b/src/middleware/header.js
index ed06c88ca5..cb29604f95 100644
--- a/src/middleware/header.js
+++ b/src/middleware/header.js
@@ -135,6 +135,7 @@ module.exports = function (middleware) {
 				results.user.isGlobalMod = results.isGlobalMod;
 				results.user.isMod = !!results.isModerator;
 				results.user.privileges = results.privileges;
+				results.user[results.user.status] = true;
 
 				results.user.uid = parseInt(results.user.uid, 10);
 				results.user.email = String(results.user.email);