diff --git a/application/Poprackmodule/PoprackmoduleController.php b/application/Poprackmodule/PoprackmoduleController.php
index 8f818e1ee..9e20333da 100644
--- a/application/Poprackmodule/PoprackmoduleController.php
+++ b/application/Poprackmodule/PoprackmoduleController.php
@@ -91,7 +91,6 @@ class PoprackmoduleController extends mfBaseController
             }
         }
         $data = [];
-
         if ($r->type == 0) {
             $data['ports'] = ($r->ports) ? $r->ports : null;
             $data['plug'] = ($r->plug) ? $r->plug : null;
@@ -102,7 +101,7 @@ class PoprackmoduleController extends mfBaseController
                 }
 
             } else if ($poprackmodulepatchcounter < $data['ports']) {
-                $datapatchModel=[];
+                $datapatchModel = [];
                 for ($i = $poprackmodulepatchcounter + 1; $i <= $data['ports']; $i++) {
                     $datapatchModel['poprackmodule_id'] = $id;
                     $datapatchModel['port'] = $i;
@@ -111,6 +110,12 @@ class PoprackmoduleController extends mfBaseController
                 }
 
             }
+        } else {
+            $data['ports'] = null;
+            $data['plug'] = null;
+        }
+        if (is_numeric($r->type)) {
+            $data['type'] = $r->type;
         }
         $data['name'] = ($r->name);
         $poprackmodule->update($data);
diff --git a/public/js/pages/pop/detail.js b/public/js/pages/pop/detail.js
index df889e27b..57e7df7f6 100644
--- a/public/js/pages/pop/detail.js
+++ b/public/js/pages/pop/detail.js
@@ -79,7 +79,7 @@ $(document).ready(function () {
         var hemaxcount = 1;
         var hemaxcountactive = 1;
         var edit = 0;
-
+        $('#module-type option').prop('disabled', false);
         var parent = trigger.closest('tr');
         if (trigger.closest('tr').find('td').eq(1).html() === undefined) {
             edit = 1;
@@ -124,14 +124,17 @@ $(document).ready(function () {
                     $('#module-device-id').hide();
                     $('#module-device-text').text(parent.find('td').eq(1).data('name'));
                     $('#module-device-text').show();
+                    $('#module-type option').prop('disabled', true);
                 }
                 if (parent.find('td').eq(1).data('ports') != "") {
                     $('#module-ports').val(parent.find('td').eq(1).data('ports')).change();
                     $('#module-plug').val(parent.find('td').eq(1).data('plug'));
                 }
-                $('#module-type').attr('disabled', 'disabled');
+                //$('#module-type').attr('disabled', 'disabled');
+
                 $('#module-name').val(parent.find('td').eq(1).data('name'));
                 // $('#module-name').attr('disabled', 'disabled');
+                $('#module-type option[value="1"]').prop('disabled', true);
 
 
                 $('#module-remove').data('moduleid', parent.find('td').eq(1).data('id'));
@@ -318,6 +321,7 @@ $(document).ready(function () {
         if (!error) {
             $.post(linkUpdateModule, {
                 id: moduleid,
+                type: $.trim($('#module-type').val()),
                 name: $.trim($('#module-name').val()),
                 ports: $.trim($('#module-ports').val()),
                 plug: $.trim($('#module-plug').val())