diff --git a/src/sunstone/public/app/tabs/datastores-tab/form-panels/create.js b/src/sunstone/public/app/tabs/datastores-tab/form-panels/create.js
index 655795d5c3..6af6c81e23 100644
--- a/src/sunstone/public/app/tabs/datastores-tab/form-panels/create.js
+++ b/src/sunstone/public/app/tabs/datastores-tab/form-panels/create.js
@@ -110,55 +110,55 @@ define(function(require) {
 
     $('select#ds_mad', dialog).change(function() {
       if ($(this).val() == "custom")
-          $('input[name="ds_tab_custom_ds_mad"]').parent().show();
+          $('input[name="ds_tab_custom_ds_mad"]', dialog).parent().show();
       else
-          $('input[name="ds_tab_custom_ds_mad"]').parent().hide();
+          $('input[name="ds_tab_custom_ds_mad"]', dialog).parent().hide();
     });
 
     $('select#tm_mad', dialog).change(function() {
       if ($(this).val() == "custom")
-          $('input[name="ds_tab_custom_tm_mad"]').parent().show();
+          $('input[name="ds_tab_custom_tm_mad"]', dialog).parent().show();
       else
-          $('input[name="ds_tab_custom_tm_mad"]').parent().hide();
+          $('input[name="ds_tab_custom_tm_mad"]', dialog).parent().hide();
     });
 
-    $('#presets').change(function() {
+    $('#presets', dialog).change(function() {
       _hideAll(dialog);
       var choice_str = $(this).val();
       switch (choice_str)
       {
         case 'fs':
-          _selectFilesystem();
+          _selectFilesystem(dialog);
           break;
         case 'vmware_vmfs':
-          _selectVmwareVmfs();
+          _selectVmwareVmfs(dialog);
           break;
         case 'block_lvm':
-          _selectBlockLvm();
+          _selectBlockLvm(dialog);
           break;
         case 'fs_lvm':
-          _selectFsLvm();
+          _selectFsLvm(dialog);
           break;
         case 'ceph':
-          _selectCeph();
+          _selectCeph(dialog);
           break;
         case 'gluster':
-          _selectGluster();
+          _selectGluster(dialog);
           break;
         case 'dev':
-          _selectDevices();
+          _selectDevices(dialog);
           break;
         case 'custom':
-          _selectCustom();
+          _selectCustom(dialog);
           break;
       }
     });
 
     // Hide disk_type
-    $('select#disk_type').parent().hide();
+    $('select#disk_type', dialog).parent().hide();
 
     _hideAll(dialog);
-    _selectFilesystem();
+    _selectFilesystem(dialog);
   }
 
 
@@ -167,9 +167,9 @@ define(function(require) {
     var cluster_id      = $(".resource_list_select", $('#cluster_id', dialog)).val();
     var ds_type         = $('input[name=ds_type]:checked', dialog).val();
     var ds_mad          = $('#ds_mad', dialog).val();
-    ds_mad              = ds_mad == "custom" ? $('input[name="ds_tab_custom_ds_mad"]').val() : ds_mad;
+    ds_mad              = ds_mad == "custom" ? $('input[name="ds_tab_custom_ds_mad"]', dialog).val() : ds_mad;
     var tm_mad          = $('#tm_mad', dialog).val();
-    tm_mad              = tm_mad == "custom" ? $('input[name="ds_tab_custom_tm_mad"]').val() : tm_mad;
+    tm_mad              = tm_mad == "custom" ? $('input[name="ds_tab_custom_tm_mad"]', dialog).val() : tm_mad;
     var type            = $('#disk_type', dialog).val();
 
     var safe_dirs       = $('#safe_dirs', dialog).val();
@@ -289,8 +289,8 @@ define(function(require) {
     // Hide all the options that depends on datastore type
     // and reset the selects
 
-    $('input#image_ds_type').attr('checked', 'true');
-    $('input[name=ds_type]').removeAttr('disabled', 'disabled');
+    $('input#image_ds_type', dialog).attr('checked', 'true');
+    $('input[name=ds_type]', dialog).removeAttr('disabled', 'disabled');
 
     $('label[for="bridge_list"],input#bridge_list', dialog).parent().hide();
     $('label[for="ds_tmp_dir"],input#ds_tmp_dir', dialog).parent().hide();
@@ -305,13 +305,13 @@ define(function(require) {
     $('label[for="staging_dir"],input#staging_dir', dialog).parent().hide();
     $('label[for="limit_transfer_bw"],input#limit_transfer_bw', dialog).parent().hide();
     $('label[for="no_decompress"],input#no_decompress', dialog).parent().hide();
-    $('select#ds_mad').removeAttr('disabled');
-    $('select#tm_mad').removeAttr('disabled');
-    $('select#tm_mad').children('option').each(function() {
+    $('select#ds_mad', dialog).removeAttr('disabled');
+    $('select#tm_mad', dialog).removeAttr('disabled');
+    $('select#tm_mad', dialog).children('option').each(function() {
         $(this).removeAttr('disabled');
       });
-    $('select#disk_type').removeAttr('disabled');
-    $('select#disk_type').children('option').each(function() {
+    $('select#disk_type', dialog).removeAttr('disabled');
+    $('select#disk_type', dialog).children('option').each(function() {
         $(this).removeAttr('disabled');
       });
 
@@ -320,10 +320,10 @@ define(function(require) {
   }
 
   function _selectFilesystem(dialog) {
-    $('select#ds_mad').val('fs');
-    $('select#tm_mad').val('shared');
-    $('select#ds_mad').attr('disabled', 'disabled');
-    $('select#tm_mad').children('option').each(function() {
+    $('select#ds_mad', dialog).val('fs');
+    $('select#tm_mad', dialog).val('shared');
+    $('select#ds_mad', dialog).attr('disabled', 'disabled');
+    $('select#tm_mad', dialog).children('option').each(function() {
         var value_str = $(this).val();
         $(this).attr('disabled', 'disabled');
         if (value_str == "qcow2"  ||
@@ -332,106 +332,106 @@ define(function(require) {
           $(this).removeAttr('disabled');
         }
       });
-    $('select#disk_type').val('file');
-    $('select#disk_type').attr('disabled', 'disabled');
-    $('label[for="limit_transfer_bw"],input#limit_transfer_bw').parent().fadeIn();
-    $('label[for="no_decompress"],input#no_decompress').parent().fadeIn();
-    $('label[for="datastore_capacity_check"],input#datastore_capacity_check').parent().fadeIn();
-    $('input#safe_dirs').removeAttr('disabled');
-    $('select#disk_type').removeAttr('disabled');
-    $('input#base_path').removeAttr('disabled');
-    $('input#limit_mb').removeAttr('disabled');
-    $('input#restricted_dirs').removeAttr('disabled');
-    $('label[for="bridge_list"],input#bridge_list').parent().fadeIn();
-    $('label[for="staging_dir"],input#staging_dir').parent().fadeIn();
+    $('select#disk_type', dialog).val('file');
+    $('select#disk_type', dialog).attr('disabled', 'disabled');
+    $('label[for="limit_transfer_bw"],input#limit_transfer_bw', dialog).parent().fadeIn();
+    $('label[for="no_decompress"],input#no_decompress', dialog).parent().fadeIn();
+    $('label[for="datastore_capacity_check"],input#datastore_capacity_check', dialog).parent().fadeIn();
+    $('input#safe_dirs', dialog).removeAttr('disabled');
+    $('select#disk_type', dialog).removeAttr('disabled');
+    $('input#base_path', dialog).removeAttr('disabled');
+    $('input#limit_mb', dialog).removeAttr('disabled');
+    $('input#restricted_dirs', dialog).removeAttr('disabled');
+    $('label[for="bridge_list"],input#bridge_list', dialog).parent().fadeIn();
+    $('label[for="staging_dir"],input#staging_dir', dialog).parent().fadeIn();
   }
 
   function _selectVmwareVmfs(dialog) {
-    $('label[for="bridge_list"],input#bridge_list').parent().fadeIn();
-    $('label[for="ds_tmp_dir"],input#ds_tmp_dir').parent().fadeIn();
-    $('select#ds_mad').val('vmfs');
-    $('select#ds_mad').attr('disabled', 'disabled');
-    $('select#tm_mad').val('vmfs');
-    $('select#tm_mad').attr('disabled', 'disabled');
-    $('label[for="limit_transfer_bw"],input#limit_transfer_bw').parent().fadeIn();
-    $('label[for="no_decompress"],input#no_decompress').parent().fadeIn();
-    $('label[for="datastore_capacity_check"],input#datastore_capacity_check').parent().fadeIn();
-    $('select#disk_type').val('file');
-    $('select#disk_type').attr('disabled', 'disabled');
-    $('input#safe_dirs').removeAttr('disabled');
-    $('input#base_path').removeAttr('disabled');
-    $('input#limit_mb').removeAttr('disabled');
-    $('input#restricted_dirs').removeAttr('disabled');
+    $('label[for="bridge_list"],input#bridge_list', dialog).parent().fadeIn();
+    $('label[for="ds_tmp_dir"],input#ds_tmp_dir', dialog).parent().fadeIn();
+    $('select#ds_mad', dialog).val('vmfs');
+    $('select#ds_mad', dialog).attr('disabled', 'disabled');
+    $('select#tm_mad', dialog).val('vmfs');
+    $('select#tm_mad', dialog).attr('disabled', 'disabled');
+    $('label[for="limit_transfer_bw"],input#limit_transfer_bw', dialog).parent().fadeIn();
+    $('label[for="no_decompress"],input#no_decompress', dialog).parent().fadeIn();
+    $('label[for="datastore_capacity_check"],input#datastore_capacity_check', dialog).parent().fadeIn();
+    $('select#disk_type', dialog).val('file');
+    $('select#disk_type', dialog).attr('disabled', 'disabled');
+    $('input#safe_dirs', dialog).removeAttr('disabled');
+    $('input#base_path', dialog).removeAttr('disabled');
+    $('input#limit_mb', dialog).removeAttr('disabled');
+    $('input#restricted_dirs', dialog).removeAttr('disabled');
   }
 
   function _selectCeph(dialog) {
-    $('input#image_ds_type').attr('checked', 'true');
-    $('input[name=ds_type]').attr('disabled', 'disabled');
-    $('select#ds_mad').val('ceph');
-    $('select#ds_mad').attr('disabled', 'disabled');
-    $('select#tm_mad').val('ceph');
-    $('select#tm_mad').attr('disabled', 'disabled');
-    $('label[for="bridge_list"],input#bridge_list').parent().fadeIn();
-    $('label[for="pool_name"],input#pool_name').parent().fadeIn();
-    $('label[for="ceph_host"],input#ceph_host').parent().fadeIn();
-    $('label[for="ceph_secret"],input#ceph_secret').parent().fadeIn();
-    $('label[for="ceph_user"],input#ceph_user').parent().fadeIn();
-    $('label[for="rbd_format"],input#rbd_format').parent().fadeIn();
-    $('label[for="staging_dir"],input#staging_dir').parent().fadeIn();
-    $('label[for="limit_transfer_bw"],input#limit_transfer_bw').parent().fadeIn();
-    $('label[for="no_decompress"],input#no_decompress').parent().fadeIn();
-    $('label[for="datastore_capacity_check"],input#datastore_capacity_check').parent().fadeIn();
-    $('select#disk_type').val('RBD');
-    $('select#disk_type').attr('disabled', 'disabled');
-    $('input#safe_dirs').removeAttr('disabled');
-    $('input#base_path').removeAttr('disabled');
-    $('input#limit_mb').removeAttr('disabled');
-    $('input#restricted_dirs').removeAttr('disabled');
+    $('input#image_ds_type', dialog).attr('checked', 'true');
+    $('input[name=ds_type]', dialog).attr('disabled', 'disabled');
+    $('select#ds_mad', dialog).val('ceph');
+    $('select#ds_mad', dialog).attr('disabled', 'disabled');
+    $('select#tm_mad', dialog).val('ceph');
+    $('select#tm_mad', dialog).attr('disabled', 'disabled');
+    $('label[for="bridge_list"],input#bridge_list', dialog).parent().fadeIn();
+    $('label[for="pool_name"],input#pool_name', dialog).parent().fadeIn();
+    $('label[for="ceph_host"],input#ceph_host', dialog).parent().fadeIn();
+    $('label[for="ceph_secret"],input#ceph_secret', dialog).parent().fadeIn();
+    $('label[for="ceph_user"],input#ceph_user', dialog).parent().fadeIn();
+    $('label[for="rbd_format"],input#rbd_format', dialog).parent().fadeIn();
+    $('label[for="staging_dir"],input#staging_dir', dialog).parent().fadeIn();
+    $('label[for="limit_transfer_bw"],input#limit_transfer_bw', dialog).parent().fadeIn();
+    $('label[for="no_decompress"],input#no_decompress', dialog).parent().fadeIn();
+    $('label[for="datastore_capacity_check"],input#datastore_capacity_check', dialog).parent().fadeIn();
+    $('select#disk_type', dialog).val('RBD');
+    $('select#disk_type', dialog).attr('disabled', 'disabled');
+    $('input#safe_dirs', dialog).removeAttr('disabled');
+    $('input#base_path', dialog).removeAttr('disabled');
+    $('input#limit_mb', dialog).removeAttr('disabled');
+    $('input#restricted_dirs', dialog).removeAttr('disabled');
   }
 
   function _selectBlockLvm(dialog) {
-    $('select#ds_mad').val('lvm');
-    $('select#ds_mad').attr('disabled', 'disabled');
-    $('select#tm_mad').val('lvm');
-    $('select#tm_mad').attr('disabled', 'disabled');
-    $('input#image_ds_type').attr('checked', 'true');
-    $('input[name=ds_type]').attr('disabled', 'disabled');
-    $('label[for="bridge_list"],input#bridge_list').parent().fadeIn();
-    $('label[for="vg_name"],input#vg_name').fadeIn();
-    $('label[for="limit_transfer_bw"],input#limit_transfer_bw').parent().fadeIn();
-    $('label[for="no_decompress"],input#no_decompress').parent().fadeIn();
-    $('label[for="datastore_capacity_check"],input#datastore_capacity_check').parent().fadeIn();
-    $('select#disk_type').val('block');
-    $('select#disk_type').attr('disabled', 'disabled');
-    $('input#safe_dirs').removeAttr('disabled');
-    $('input#base_path').removeAttr('disabled');
-    $('input#limit_mb').removeAttr('disabled');
-    $('input#restricted_dirs').removeAttr('disabled');
+    $('select#ds_mad', dialog).val('lvm');
+    $('select#ds_mad', dialog).attr('disabled', 'disabled');
+    $('select#tm_mad', dialog).val('lvm');
+    $('select#tm_mad', dialog).attr('disabled', 'disabled');
+    $('input#image_ds_type', dialog).attr('checked', 'true');
+    $('input[name=ds_type]', dialog).attr('disabled', 'disabled');
+    $('label[for="bridge_list"],input#bridge_list', dialog).parent().fadeIn();
+    $('label[for="vg_name"],input#vg_name', dialog).fadeIn();
+    $('label[for="limit_transfer_bw"],input#limit_transfer_bw', dialog).parent().fadeIn();
+    $('label[for="no_decompress"],input#no_decompress', dialog).parent().fadeIn();
+    $('label[for="datastore_capacity_check"],input#datastore_capacity_check', dialog).parent().fadeIn();
+    $('select#disk_type', dialog).val('block');
+    $('select#disk_type', dialog).attr('disabled', 'disabled');
+    $('input#safe_dirs', dialog).removeAttr('disabled');
+    $('input#base_path', dialog).removeAttr('disabled');
+    $('input#limit_mb', dialog).removeAttr('disabled');
+    $('input#restricted_dirs', dialog).removeAttr('disabled');
   }
 
   function _selectFsLvm(dialog) {
-    $('select#ds_mad').val('fs');
-    $('select#ds_mad').attr('disabled', 'disabled');
-    $('select#tm_mad').val('fs_lvm');
-    $('select#tm_mad').attr('disabled', 'disabled');
-    $('input#image_ds_type').attr('checked', 'true');
-    $('input[name=ds_type]').attr('disabled', 'disabled');
-    $('label[for="limit_transfer_bw"],input#limit_transfer_bw').parent().fadeIn();
-    $('label[for="no_decompress"],input#no_decompress').parent().fadeIn();
-    $('label[for="datastore_capacity_check"],input#datastore_capacity_check').parent().fadeIn();
-    $('select#disk_type').val('block');
-    $('select#disk_type').attr('disabled', 'disabled');
-    $('input#safe_dirs').removeAttr('disabled');
-    $('input#base_path').removeAttr('disabled');
-    $('input#limit_mb').removeAttr('disabled');
-    $('input#restricted_dirs').removeAttr('disabled');
+    $('select#ds_mad', dialog).val('fs');
+    $('select#ds_mad', dialog).attr('disabled', 'disabled');
+    $('select#tm_mad', dialog).val('fs_lvm');
+    $('select#tm_mad', dialog).attr('disabled', 'disabled');
+    $('input#image_ds_type', dialog).attr('checked', 'true');
+    $('input[name=ds_type]', dialog).attr('disabled', 'disabled');
+    $('label[for="limit_transfer_bw"],input#limit_transfer_bw', dialog).parent().fadeIn();
+    $('label[for="no_decompress"],input#no_decompress', dialog).parent().fadeIn();
+    $('label[for="datastore_capacity_check"],input#datastore_capacity_check', dialog).parent().fadeIn();
+    $('select#disk_type', dialog).val('block');
+    $('select#disk_type', dialog).attr('disabled', 'disabled');
+    $('input#safe_dirs', dialog).removeAttr('disabled');
+    $('input#base_path', dialog).removeAttr('disabled');
+    $('input#limit_mb', dialog).removeAttr('disabled');
+    $('input#restricted_dirs', dialog).removeAttr('disabled');
   }
 
   function _selectGluster(dialog) {
-    $('select#ds_mad').val('fs');
-    $('select#ds_mad').attr('disabled', 'disabled');
-    $('select#tm_mad').val('shared');
-    $('select#tm_mad').children('option').each(function() {
+    $('select#ds_mad', dialog).val('fs');
+    $('select#ds_mad', dialog).attr('disabled', 'disabled');
+    $('select#tm_mad', dialog).val('shared');
+    $('select#tm_mad', dialog).children('option').each(function() {
         var value_str = $(this).val();
         $(this).attr('disabled', 'disabled');
         if (value_str == "shared"  ||
@@ -439,50 +439,50 @@ define(function(require) {
           $(this).removeAttr('disabled');
         }
       });
-    $('input#image_ds_type').attr('checked', 'true');
-    $('input[name=ds_type]').attr('disabled', 'disabled');
-    $('select#disk_type').val('gluster');
-    $('select#disk_type').attr('disabled', 'disabled');
-    $('label[for="gluster_host"],input#gluster_host').parent().fadeIn();
-    $('label[for="gluster_volume"],input#gluster_volume').parent().fadeIn();
-    $('label[for="limit_transfer_bw"],input#limit_transfer_bw').parent().fadeIn();
-    $('label[for="no_decompress"],input#no_decompress').parent().fadeIn();
-    $('label[for="datastore_capacity_check"],input#datastore_capacity_check').parent().fadeIn();
-    $('input#safe_dirs').removeAttr('disabled');
-    $('input#base_path').removeAttr('disabled');
-    $('input#limit_mb').removeAttr('disabled');
-    $('input#restricted_dirs').removeAttr('disabled');
+    $('input#image_ds_type', dialog).attr('checked', 'true');
+    $('input[name=ds_type]', dialog).attr('disabled', 'disabled');
+    $('select#disk_type', dialog).val('gluster');
+    $('select#disk_type', dialog).attr('disabled', 'disabled');
+    $('label[for="gluster_host"],input#gluster_host', dialog).parent().fadeIn();
+    $('label[for="gluster_volume"],input#gluster_volume', dialog).parent().fadeIn();
+    $('label[for="limit_transfer_bw"],input#limit_transfer_bw', dialog).parent().fadeIn();
+    $('label[for="no_decompress"],input#no_decompress', dialog).parent().fadeIn();
+    $('label[for="datastore_capacity_check"],input#datastore_capacity_check', dialog).parent().fadeIn();
+    $('input#safe_dirs', dialog).removeAttr('disabled');
+    $('input#base_path', dialog).removeAttr('disabled');
+    $('input#limit_mb', dialog).removeAttr('disabled');
+    $('input#restricted_dirs', dialog).removeAttr('disabled');
   }
 
   function _selectDevices(dialog) {
-    $('select#ds_mad').val('dev');
-    $('select#ds_mad').attr('disabled', 'disabled');
-    $('select#tm_mad').val('dev');
-    $('select#tm_mad').attr('disabled', 'disabled');
-    $('input#image_ds_type').attr('checked', 'true');
-    $('input[name=ds_type]').attr('disabled', 'disabled');
-    $('select#disk_type').val('block');
-    $('select#disk_type').attr('disabled', 'disabled');
-    $('label[for="limit_transfer_bw"],input#limit_transfer_bw').parent().hide();
-    $('label[for="no_decompress"],input#no_decompress').parent().hide();
-    $('label[for="datastore_capacity_check"],input#datastore_capacity_check').parent().hide();
-    $('input#safe_dirs').attr('disabled', 'disabled');
-    $('input#base_path').attr('disabled', 'disabled');
-    $('input#limit_mb').attr('disabled', 'disabled');
-    $('input#restricted_dirs').attr('disabled', 'disabled');
+    $('select#ds_mad', dialog).val('dev');
+    $('select#ds_mad', dialog).attr('disabled', 'disabled');
+    $('select#tm_mad', dialog).val('dev');
+    $('select#tm_mad', dialog).attr('disabled', 'disabled');
+    $('input#image_ds_type', dialog).attr('checked', 'true');
+    $('input[name=ds_type]', dialog).attr('disabled', 'disabled');
+    $('select#disk_type', dialog).val('block');
+    $('select#disk_type', dialog).attr('disabled', 'disabled');
+    $('label[for="limit_transfer_bw"],input#limit_transfer_bw', dialog).parent().hide();
+    $('label[for="no_decompress"],input#no_decompress', dialog).parent().hide();
+    $('label[for="datastore_capacity_check"],input#datastore_capacity_check', dialog).parent().hide();
+    $('input#safe_dirs', dialog).attr('disabled', 'disabled');
+    $('input#base_path', dialog).attr('disabled', 'disabled');
+    $('input#limit_mb', dialog).attr('disabled', 'disabled');
+    $('input#restricted_dirs', dialog).attr('disabled', 'disabled');
   }
 
   function _selectCustom(dialog) {
     _hideAll(dialog);
-    $('select#ds_mad').val('fs');
-    $('select#tm_mad').val('shared');
-    $('input#safe_dirs').removeAttr('disabled');
-    $('select#disk_type').removeAttr('disabled');
-    $('input#base_path').removeAttr('disabled');
-    $('input#limit_mb').removeAttr('disabled');
-    $('input#restricted_dirs').removeAttr('disabled');
-    $('label[for="limit_transfer_bw"],input#limit_transfer_bw').parent().fadeIn();
-    $('label[for="no_decompress"],input#no_decompress').parent().fadeIn();
-    $('label[for="datastore_capacity_check"],input#datastore_capacity_check').parent().fadeIn();
+    $('select#ds_mad', dialog).val('fs');
+    $('select#tm_mad', dialog).val('shared');
+    $('input#safe_dirs', dialog).removeAttr('disabled');
+    $('select#disk_type', dialog).removeAttr('disabled');
+    $('input#base_path', dialog).removeAttr('disabled');
+    $('input#limit_mb', dialog).removeAttr('disabled');
+    $('input#restricted_dirs', dialog).removeAttr('disabled');
+    $('label[for="limit_transfer_bw"],input#limit_transfer_bw', dialog).parent().fadeIn();
+    $('label[for="no_decompress"],input#no_decompress', dialog).parent().fadeIn();
+    $('label[for="datastore_capacity_check"],input#datastore_capacity_check', dialog).parent().fadeIn();
   }
 });