diff --git a/admin/manage_categories.php b/admin/manage_categories.php
index f945efab..da268c17 100644
--- a/admin/manage_categories.php
+++ b/admin/manage_categories.php
@@ -456,7 +456,7 @@ $res = hesk_dbQuery("SELECT * FROM `" . hesk_dbEscape($hesk_settings['db_pfix'])
                     <span id="title-add-category"><?php echo $hesklang['create_cat']; ?></span>
                 </h4>
             </div>
-            <form action="manage_categories.php" class="form-horizontal" data-toggle="validator" method="post">
+            <form id="manage-category" class="form-horizontal" data-toggle="validator" method="post">
                 <div class="modal-body">
                     <div class="row">
                         <div class="col-md-12">
@@ -557,6 +557,9 @@ $res = hesk_dbQuery("SELECT * FROM `" . hesk_dbEscape($hesk_settings['db_pfix'])
                     <input type="hidden" name="id">
                     <input type="hidden" name="a" value="edit">
                     <input type="hidden" name="token" value="<?php hesk_token_echo(); ?>">
+                    <input type="hidden" name="cat-order">
+                    <input type="hidden" name="type">
+                    <input type="hidden" name="autoassign">
                     <div class="btn-group">
                         <button type="button" class="btn btn-default cancel-callback" data-dismiss="modal">
                             <i class="fa fa-times-circle"></i>
diff --git a/internal-api/js/manage-categories.js b/internal-api/js/manage-categories.js
index d99b5579..f9d5e49d 100644
--- a/internal-api/js/manage-categories.js
+++ b/internal-api/js/manage-categories.js
@@ -4,6 +4,7 @@ $(document).ready(function() {
     loadTable();
     bindEditModal();
     bindModalCancelCallback();
+    bindFormSubmit();
 });
 
 
@@ -142,7 +143,9 @@ function bindEditModal() {
         $modal.find('input[name="name"]').val(element.name).end()
             .find('select[name="priority"]').val(element.priority).end()
             .find('input[name="id"]').val(element.id).end()
-            .find('select[name="usage"]').val(element.usage).end();
+            .find('select[name="usage"]').val(element.usage).end()
+            .find('input[name="display-border"][value="' + (element.displayBorder ? 1 : 0) + '"]')
+                .prop('checked', 'checked').end();
 
         var backgroundColor = element.backgroundColor;
         var foregroundColor = element.foregroundColor;
@@ -162,41 +165,7 @@ function bindEditModal() {
 
         $modal.find('input[name="foreground-color"]')
             .colorpicker(colorpickerOptions).end().modal('show');
-
-        /*$modal.find('select[name="place"]').val(element.place);
-        $modal.find('input[name="id"]').val(element.id);
-        $modal.find('input[name="url"]').val(element.url);
-        var $textLanguages = $modal.find('[data-text-language]');
-        $.each($textLanguages, function() {
-            var language = $(this).data('text-language');
-
-            $(this).val(element.text[language]);
-        });
-
-        var $subtextLanguages = $modal.find('[data-subtext-language]');
-        $.each($subtextLanguages, function() {
-            var language = $(this).data('subtext-language');
-
-            $(this).val(element.subtext[language]);
-        });
-
-        if (element.place === 1) {
-            $('#subtext').show();
-        } else {
-            $('#subtext').hide();
-        }
-
-        if (element.imageUrl !== null) {
-            $modal.find('select[name="image-type"]').val('image-url');
-            $modal.find('input[name="image-url"]').val(element.imageUrl);
-            $modal.find('#font-icon-group').hide();
-            $modal.find('#image-url-group').show();
-        } else {
-            $modal.find('select[name="image-type"]').val('font-icon');
-            $('[data-toggle="nav-iconpicker"]').iconpicker('setIcon', element.fontIcon);
-            $modal.find('#font-icon-group').show();
-            $modal.find('#image-url-group').hide();
-        }*/
+        $modal.find('input[name="cat-order"]').val(element.catOrder);
 
         $modal.modal('show');
     });
@@ -208,5 +177,70 @@ function bindModalCancelCallback() {
 
         $editCategoryModal.find('input[name="background-color"]').val('').colorpicker('destroy').end();
         $editCategoryModal.find('input[name="foreground-color"]').val('').colorpicker('destroy').end();
+        $editCategoryModal.find('input[name="display-border"][value="1"]').prop('checked');
+        $editCategoryModal.find('input[name="display-border"][value="0"]').prop('checked');
+    });
+}
+
+function bindFormSubmit() {
+    $('form#manage-category').submit(function(e) {
+        e.preventDefault();
+        var heskUrl = $('p#hesk-path').text();
+
+        var $modal = $('#category-modal');
+
+        var data = {
+            autoassign: $modal.find('input[name="autoassign"]').val(),
+            backgroundColor: $modal.find('input[name="background-color"]').val(),
+            description: $modal.find('textarea[name="description"]').val(),
+            displayBorder: $modal.find('input[name="display-border"]:checked').val(),
+            foregroundColor: $modal.find('input[name="foreground-color"]').val() === '' ? 'AUTO' : $modal.find('input[name="foreground-color"]'),
+            name: $modal.find('input[name="name"]').val(),
+            priority: $modal.find('select[name="priority"]').val(),
+            type: $modal.find('input[name="type"]').val(),
+            usage: $modal.find('select[name="usage"]').val(),
+            catOrder: $modal.find('input[name="cat-order"]').val()
+        };
+
+        var url = heskUrl + 'api/index.php/v1/categories/';
+        var method = 'POST';
+
+        var categoryId = $modal.find('input[name="id"]').val();
+        if (categoryId !== -1) {
+            url += id;
+            method = 'PUT';
+        }
+
+        $modal.find('#action-buttons').find('.cancel-button').attr('disabled', 'disabled');
+        $modal.find('#action-buttons').find('.save-button').attr('disabled', 'disabled');
+
+        console.log('')
+
+        /*$.ajax({
+            method: 'POST',
+            url: url,
+            headers: {
+                'X-Internal-Call': true,
+                'X-HTTP-Method-Override': method
+            },
+            data: JSON.stringify(data),
+            success: function(data) {
+                if (id === -1) {
+                    mfhAlert.success('CREATED');
+                } else {
+                    mfhAlert.success('SAVED');
+                }
+                $modal.modal('hide');
+                loadTable();
+            },
+            error: function(data) {
+                mfhAlert.errorWithLog('ERROR SAVING/CREATING', data.responseJSON);
+                console.error(data);
+            },
+            complete: function(data) {
+                $modal.find('#action-buttons').find('.cancel-button').removeAttr('disabled');
+                $modal.find('#action-buttons').find('.save-button').removeAttr('disabled');
+            }
+        });*/
     });
 }
\ No newline at end of file