diff --git a/admin/admin_ticket.php b/admin/admin_ticket.php
index 1e156790..9743f626 100644
--- a/admin/admin_ticket.php
+++ b/admin/admin_ticket.php
@@ -1851,7 +1851,7 @@ function hesk_printTicketReplies()
 
 function hesk_printReplyForm()
 {
-    global $hesklang, $hesk_settings, $ticket, $admins, $can_options, $can_resolve, $options, $can_assign_self, $modsForHesk_settings;
+    global $hesklang, $hesk_settings, $ticket, $admins, $can_options, $can_resolve, $options, $can_assign_self, $modsForHesk_settings, $isManager;
 
     // Force assigning a ticket before allowing to reply?
     if ($hesk_settings['require_owner'] && ! $ticket['owner'])
diff --git a/internal-api/js/manage-categories.js b/internal-api/js/manage-categories.js
index b58ad9c6..5ea1ad59 100644
--- a/internal-api/js/manage-categories.js
+++ b/internal-api/js/manage-categories.js
@@ -172,6 +172,7 @@ function bindEditModal() {
 
         $modal.find('input[name="name"]').val(element.name).end()
             .find('select[name="priority"]').val(element.priority).end()
+            .find('select[name="manager"]').val(element.manager === null ? 0 : element.manager).end()
             .find('input[name="id"]').val(element.id).end()
             .find('select[name="usage"]').val(element.usage).end()
             .find('input[name="display-border"][value="' + (element.displayBorder ? 1 : 0) + '"]')
@@ -264,14 +265,17 @@ function bindFormSubmit() {
 
         var $modal = $('#category-modal');
 
+        var foregroundColor = $modal.find('input[name="foreground-color"]').val();
+        var manager = parseInt($modal.find('select[name="manager"]').val());
         var data = {
             autoassign: $modal.find('input[name="autoassign"]').val() === 'true',
             backgroundColor: $modal.find('input[name="background-color"]').val(),
             description: $modal.find('textarea[name="description"]').val(),
             displayBorder: $modal.find('input[name="display-border"]:checked').val() === '1',
-            foregroundColor: $modal.find('input[name="foreground-color"]').val() === '' ? 'AUTO' : $modal.find('input[name="foreground-color"]').val(),
+            foregroundColor: foregroundColor === '' ? 'AUTO' : foregroundColor,
             name: $modal.find('input[name="name"]').val(),
             priority: parseInt($modal.find('select[name="priority"]').val()),
+            manager: manager === 0 ? null : manager,
             type: parseInt($modal.find('input[name="type"]:checked').val()),
             usage: parseInt($modal.find('select[name="usage"]').val()),
             catOrder: parseInt($modal.find('input[name="cat-order"]').val())