diff --git a/public/language/en-GB/admin/manage/categories.json b/public/language/en-GB/admin/manage/categories.json
index 758785d689..af717ec2c9 100644
--- a/public/language/en-GB/admin/manage/categories.json
+++ b/public/language/en-GB/admin/manage/categories.json
@@ -68,5 +68,6 @@
 	"alert.find-group": "Find a Group",
 	"alert.group-search": "Search for a group here...",
 	"collapse-all": "Collapse All",
-	"expand-all": "Expand All"
+	"expand-all": "Expand All",
+	"disable-on-create": "Disable on create"
 }
\ No newline at end of file
diff --git a/src/categories/create.js b/src/categories/create.js
index 55e434f1a0..835515c2b4 100644
--- a/src/categories/create.js
+++ b/src/categories/create.js
@@ -35,7 +35,7 @@ module.exports = function (Categories) {
 					parentCid: parentCid,
 					topic_count: 0,
 					post_count: 0,
-					disabled: 0,
+					disabled: data.disabled ? 1 : 0,
 					order: order,
 					link: data.link || '',
 					numRecentReplies: 1,
diff --git a/src/controllers/admin/privileges.js b/src/controllers/admin/privileges.js
index 92dbe27ef9..08bfe3183a 100644
--- a/src/controllers/admin/privileges.js
+++ b/src/controllers/admin/privileges.js
@@ -2,6 +2,7 @@
 
 var async = require('async');
 
+var db = require('../../database');
 var categories = require('../../categories');
 var privileges = require('../../privileges');
 
@@ -19,7 +20,19 @@ privilegesController.get = function (req, res, callback) {
 						privileges.categories.list(cid, next);
 					}
 				},
-				allCategories: async.apply(categories.buildForSelect, req.uid, 'read'),
+				allCategories: function (next) {
+					async.waterfall([
+						function (next) {
+							db.getSortedSetRange('cid:0:children', 0, -1, next);
+						},
+						function (cids, next) {
+							categories.getCategories(cids, req.uid, next);
+						},
+						function (categoriesData, next) {
+							categories.buildForSelectCategories(categoriesData, next);
+						},
+					], next);
+				},
 			}, next);
 		},
 		function (data) {
diff --git a/src/views/admin/partials/categories/create.tpl b/src/views/admin/partials/categories/create.tpl
index 7fb0f2484b..c1daa78925 100644
--- a/src/views/admin/partials/categories/create.tpl
+++ b/src/views/admin/partials/categories/create.tpl
@@ -25,6 +25,13 @@
 			<input id="cloneChildren" name="cloneChildren" type="checkbox">
 			<strong>[[admin/manage/categories:clone-children]]</strong>
 		</label>
+	</div>
 
+	<div class="form-group">
+		<label>
+			<input id="disabled" name="disabled" type="checkbox">
+			<strong>[[admin/manage/categories:disable-on-create]]</strong>
+		</label>
 	</div>
+
 </form>
\ No newline at end of file