diff --git a/ui/scripts/ui/widgets/multiEdit.js b/ui/scripts/ui/widgets/multiEdit.js
index eafec673175..c29673cc807 100644
--- a/ui/scripts/ui/widgets/multiEdit.js
+++ b/ui/scripts/ui/widgets/multiEdit.js
@@ -801,7 +801,11 @@
                   );
 
             if (field.isDisabled) $input.hide();
-            if (field.defaultValue) $input.val(field.defaultValue);
+
+            if (field.defaultValue) {
+              $input.val(field.defaultValue);
+              $input.data('multi-default-value', field.defaultValue);
+            }
           });
         } else {
           var $input = $('<input>')
@@ -814,7 +818,10 @@
                 .appendTo($td);
 
           if (field.isDisabled) $input.hide();
-          if (field.defaultValue) $input.val(field.defaultValue);
+          if (field.defaultValue) {
+            $input.val(field.defaultValue);
+            $input.data('multi-default-value', field.defaultValue);
+          }
         }
       } else if (field.custom) {
         $('<div>').addClass('button add-vm custom-action')
@@ -907,7 +914,15 @@
         $dataBody.prepend($loading);
 
         // Clear out fields
-        $multi.find('input').val('');
+        $multi.find('input').each(function() {
+          var $input = $(this);
+
+          if ($input.data('multi-default-value')) {
+            $input.val($input.data('multi-default-value'));
+          } else {
+            $input.val('');
+          }
+        });
         $multi.find('tbody td').each(function() {
           var $item = $(this);
 
diff --git a/ui/scripts/vpc.js b/ui/scripts/vpc.js
index 28de435cb75..58772429d1b 100644
--- a/ui/scripts/vpc.js
+++ b/ui/scripts/vpc.js
@@ -105,8 +105,8 @@
           });
         }
       },
-      'icmptype': { edit: true, label: 'ICMP.type', isDisabled: true, desc:'Please specify -1 if you want to allow any', defaultValue:'-1' },
-      'icmpcode': { edit: true, label: 'ICMP.code', isDisabled: true, desc:'Please specify -1 if you want to allow any', defaultValue:'-1' },
+      'icmptype': { edit: true, label: 'ICMP.type', isDisabled: true, desc:'Please specify -1 if you want to allow all ICMP types', defaultValue:'-1' },
+      'icmpcode': { edit: true, label: 'ICMP.code', isDisabled: true, desc:'Please specify -1 if you want to allow all ICMP codes', defaultValue:'-1' },
       'traffictype' : {
         label: 'Traffic type',
         select: function(args) {