diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index bcefbdb4748..1b5fe2add9a 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -6111,12 +6111,16 @@
 
                       args.$select.bind("change", function(event) {
                         var $form = $(this).closest('form');
-                        var $vsmFields = $.merge(
-                          $form.find('.form-item[rel=vsmipaddress]'),
-                          $form.find('.form-item[rel=vsmusername]'),
-                          $form.find('.form-item[rel=vsmpassword]')  
-                        );
-                        
+                        var $vsmFields = $form.find('.form-item').filter(function() {
+                          var vsmFields = [
+                            'vsmipaddress',
+                            'vsmusername',
+                            'vsmpassword'
+                          ];
+
+                          return $.inArray($(this).attr('rel'), vsmFields) > -1;
+                        });
+
                         if ($(this).val() == "VMware") {
                           //$('li[input_sub_group="external"]', $dialogAddCluster).show();
                           $form.find('.form-item[rel=vCenterHost]').css('display', 'inline-block');
@@ -6224,11 +6228,10 @@
                   array1.push("&username=" + todb(args.data.vCenterUsername));
                   array1.push("&password=" + todb(args.data.vCenterPassword));
 
-                  if (args.data.enableNexusVswitch) {
                     array1.push('&vsmipaddress=' + args.data.vsmipaddress);
                     array1.push('&vsmusername=' + args.data.vsmusername);
                     array1.push('&vsmpassword=' + args.data.vsmpassword);
-                  }
+                  
 
                   var hostname = args.data.vCenterHost;
                   var dcName = args.data.vCenterDatacenter;