diff --git a/library.js b/library.js
index e3cf3d3..7f9cef0 100644
--- a/library.js
+++ b/library.js
@@ -67,6 +67,7 @@
 		} else {
 			callback(null, text.replace(/\r\n/g, "<br />"));
 		}
+
 	};
 
 	Widget.renderRecentViewWidget = function(widget, callback) {
@@ -86,6 +87,14 @@
 	};
 
 	Widget.renderActiveUsersWidget = function(widget, callback) {
+		function generateHtml(users) {
+			html = templates.parse(html, {
+				active_users: users,
+				relative_path: nconf.get('relative_path')
+			});
+			return html;
+		}
+
 		function getUserData(err, uids) {
 			if (err) {
 				return callback(err);
@@ -98,18 +107,43 @@
 					return callback(err);
 				}
 
-				html = templates.parse(html, {
-					active_users: users,
-					relative_path: nconf.get('relative_path')
-				});
+				html = generateHtml(users);
 
 				callback(err, html);
 			});
 		}
+
 		var count = Math.max(1, widget.data.numUsers || 24);
 		var html = Widget.templates['widgets/activeusers.tpl'], cidOrtid;
 		var match;
-		if (widget.data.cid) {
+		if (!!widget.data.global) {
+			async.parallel({
+				users: function(next) {
+					user.getUsersFromSet('users:online', widget.uid, 0, 49, next);
+				},
+				isAdministrator: function(next) {
+					user.isAdministrator(widget.uid, next);
+				}
+			}, function(err, results) {
+				if (err) {
+					return callback(err);
+				}
+
+				if (!results.isAdministrator) {
+					results.users = results.users.filter(function(usr) {
+						return usr && usr.status !== 'offline';
+					});
+				}
+
+				results.users = results.users.map(function(a) { 
+					return {'uid': a.uid, 'username': a.username, 'userslug': a.userslug, 'picture': a.picture}; 
+				});
+
+				html = generateHtml(results.users);
+
+				callback(null, html);
+			});
+		} else if (widget.data.cid) {
 			cidOrtid = widget.data.cid;
 			categories.getActiveUsers(cidOrtid, getUserData);
 		} else if (widget.area.url.startsWith('topic')) {
@@ -187,7 +221,7 @@
 			if (err) {
 				return callback(err);
 			}
-			app.render('widgets/recentposts', {posts: posts, numPosts: numPosts, cid: cid}, function(err, html) {
+			app.render('widgets/recentposts', {posts: posts, numPosts: numPosts, cid: cid, relative_path: nconf.get('relative_path')}, function(err, html) {
 				translator.translate(html, function(translatedHTML) {
 					callback(err, translatedHTML);
 				});
@@ -457,6 +491,5 @@
 		callback(null, widgets);
 	};
 
-
 	module.exports = Widget;
-}(module));
\ No newline at end of file
+}(module));
diff --git a/public/templates/admin/activeusers.tpl b/public/templates/admin/activeusers.tpl
index 20e0453..1d9d33e 100644
--- a/public/templates/admin/activeusers.tpl
+++ b/public/templates/admin/activeusers.tpl
@@ -1,7 +1,10 @@
-<label>Amount of Users to display:</label>
-<input type="text" class="form-control" name="numUsers" placeholder="4" />
+<label>
+  Include All Users: <input name="global" type="checkbox"><br />
+  <small>Active users will include all online users(regardless of current category).</small>
+</label>
+<br />
 <label>
 	Custom Category:<br />
 	<small>Leave blank to to dynamically pull from current category</small>
 </label>
-<input type="text" class="form-control" name="cid" placeholder="0" />
\ No newline at end of file
+<input type="text" class="form-control" name="cid" placeholder="0" />