diff --git a/admin/manage_categories.php b/admin/manage_categories.php
index 6ddce2d4..5b6cf082 100644
--- a/admin/manage_categories.php
+++ b/admin/manage_categories.php
@@ -128,6 +128,7 @@ $res = hesk_dbQuery("SELECT * FROM `" . hesk_dbEscape($hesk_settings['db_pfix'])
                                 <th><?php echo $hesklang['priority']; ?></th>
                                 <th><?php echo $hesklang['not']; ?></th>
                                 <th><?php echo $hesklang['graph']; ?></th>
+                                <th><?php echo $hesklang['manager']; ?></th>
                                 <th><?php echo $hesklang['usage']; ?></th>
                                 <th><?php echo $hesklang['opt']; ?></th>
                             </tr>
@@ -144,6 +145,19 @@ $res = hesk_dbQuery("SELECT * FROM `" . hesk_dbEscape($hesk_settings['db_pfix'])
         </div>
     </section>
 </div>
+<?php
+$usersRs = hesk_dbQuery("SELECT `id`, `name` FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "users` WHERE `active` = '1' AND `isadmin` = '0'");
+echo '<script>var users = [];';
+$users = array();
+while ($row = hesk_dbFetchAssoc($usersRs)) {
+    $users[] = $row;
+    echo "users[" . $row['id'] . "] = {
+        id: ".$row['id'].",
+        name: '".$row['name']."'
+    }\n";
+}
+echo '</script>';
+?>
 <!-- Category modal -->
 <div class="modal fade" id="category-modal" tabindex="-1" role="dialog" style="overflow: hidden">
     <div class="modal-dialog modal-lg" role="document">
@@ -268,6 +282,19 @@ $res = hesk_dbQuery("SELECT * FROM `" . hesk_dbEscape($hesk_settings['db_pfix'])
                                     </select>
                                 </div>
                             </div>
+                            <div class="form-group">
+                                <label for="manager" class="col-sm-5 control-label">
+                                    <?php echo $hesklang['manager']; ?>
+                                </label>
+                                <div class="col-sm-7">
+                                    <select name="manager" class="form-control">
+                                        <option value="0"><?php echo $hesklang['no_manager']; ?></option>
+                                        <?php foreach ($users as $user): ?>
+                                            <option value="<?php echo $user['id']; ?>"><?php echo $user['name']; ?></option>
+                                        <?php endforeach; ?>
+                                    </select>
+                                </div>
+                            </div>
                         </div>
                         <div class="col-md-6">
                             <div class="form-group">
@@ -391,6 +418,9 @@ $res = hesk_dbQuery("SELECT * FROM `" . hesk_dbEscape($hesk_settings['db_pfix'])
                 </div>
             </div>
         </td>
+        <td>
+            <span data-property="manager"></span>
+        </td>
         <td>
             <i class="fa fa-fw fa-ticket icon-link" data-toggle="tooltip" title="<?php echo $hesklang['tickets']; ?>"></i>
             <i class="fa fa-fw fa-calendar icon-link" data-toggle="tooltip" title="<?php echo $hesklang['events']; ?>"></i>
@@ -446,6 +476,7 @@ echo mfh_get_hidden_fields_for_language(array(
     'disabled_title_case',
     'geco',
     'cpric',
+    'no_manager',
 ));
 
 require_once(HESK_PATH . 'inc/footer.inc.php');
diff --git a/internal-api/js/manage-categories.js b/internal-api/js/manage-categories.js
index 853e06e1..b58ad9c6 100644
--- a/internal-api/js/manage-categories.js
+++ b/internal-api/js/manage-categories.js
@@ -119,6 +119,12 @@ function loadTable() {
                         .attr('title', mfhLang.text('geco'));
                 }
 
+                if (this.manager === null) {
+                    $template.find('[data-property="manager"]').text(mfhLang.text('no_manager'));
+                } else {
+                    $template.find('[data-property="manager"]').text(users[this.manager].name);
+                }
+
                 if (this.id === 1) {
                     $template.find('[data-action="delete"]').hide();
                 }