diff --git a/src/sunstone/public/app/utils/vcenter/datastores.js b/src/sunstone/public/app/utils/vcenter/datastores.js
index d89dcacb17..48c97d6148 100644
--- a/src/sunstone/public/app/utils/vcenter/datastores.js
+++ b/src/sunstone/public/app/utils/vcenter/datastores.js
@@ -195,6 +195,10 @@ define(function(require) {
               $.each(one_clusters, function(index, cluster_id){
                   Sunstone.runAction("Cluster.adddatastore",cluster_id,response.DATASTORE.ID);
               });
+
+              if (one_clusters.length > 0) {
+                  Sunstone.runAction("Cluster.deldatastore",0,response.DATASTORE.ID);
+              }
             },
             error: function (request, error_json) {
               VCenterCommon.importFailure({
diff --git a/src/vmm_mad/remotes/lib/vcenter_driver/importer.rb b/src/vmm_mad/remotes/lib/vcenter_driver/importer.rb
index 3a968c553d..71ac2bb6d5 100644
--- a/src/vmm_mad/remotes/lib/vcenter_driver/importer.rb
+++ b/src/vmm_mad/remotes/lib/vcenter_driver/importer.rb
@@ -157,23 +157,25 @@ def self.import_clusters(con_ops, options)
                                  "      - Location   : #{cluster[:cluster_location]}\n"\
                                  "    Import cluster (y/[n])? "
                     next if STDIN.gets.strip.downcase != 'y'
-                end
 
-                if cluster_list.size > 0
-                    STDOUT.print "\n    In which OpenNebula cluster do you want the vCenter cluster to be included?\n "
+                    if cluster_list.size > 0
+                        STDOUT.print "\n    In which OpenNebula cluster do you want the vCenter cluster to be included?\n "
 
-                    cluster_list_str = "\n"
-                    cluster_list.each do |key, value|
-                        cluster_list_str << "      - \e[94mID: " << key << "\e[39m - NAME: " << value << "\n"
+                        cluster_list_str = "\n"
+                        cluster_list.each do |key, value|
+                            cluster_list_str << "      - \e[94mID: " << key << "\e[39m - NAME: " << value << "\n"
+                        end
+
+                        STDOUT.print "\n    #{cluster_list_str}"
+                        STDOUT.print "\n    Specify the ID of the cluster or press Enter if you want OpenNebula to create a new cluster for you: "
+
+                        answer = STDIN.gets.strip
+                        if !answer.empty?
+                            one_cluster_id = answer
+                        end
                     end
 
-                    STDOUT.print "\n    #{cluster_list_str}"
-                    STDOUT.print "\n    Specify the ID of the cluster or press Enter if you want OpenNebula to create a new cluster for you: "
-
-                    answer = STDIN.gets.strip
-                    if !answer.empty?
-                        one_cluster_id = answer
-                    else
+                    if !one_cluster_id
                         one_cluster = VCenterDriver::VIHelper.new_one_item(OpenNebula::Cluster)
                         rc = one_cluster.allocate("#{cluster[:cluster_name]}")
                         if ::OpenNebula.is_error?(rc)
@@ -182,8 +184,19 @@ def self.import_clusters(con_ops, options)
                         end
                         one_cluster_id = one_cluster.id
                     end
+                else
+                    # Defaults, add host to new cluster
+                    one_cluster = VCenterDriver::VIHelper.new_one_item(OpenNebula::Cluster)
+                    rc = one_cluster.allocate("#{cluster[:cluster_name]}")
+                    if ::OpenNebula.is_error?(rc)
+                        STDOUT.puts "    Error creating OpenNebula cluster: #{rc.message}\n"
+                        next
+                    end
+                    one_cluster_id = one_cluster.id
                 end
 
+
+
                 # Generate the template and create the host in the pool
                 one_host = VCenterDriver::ClusterComputeResource.to_one(cluster,
                                                                         con_ops,
@@ -845,7 +858,18 @@ def self.import_datastore(con_ops, options)
                                 end
                                 rc = one_cluster.adddatastore(one_d.id)
                                 if ::OpenNebula.is_error?(rc)
-                                    STDOUT.puts "    \n    Error adding datastore #{one_d.id} to OpenNebula cluster #{cid}: #{rc.message}. Yoy may have to place this datastore in the right cluster by hand"
+                                    STDOUT.puts "    \n    Error adding datastore #{one_d.id} to OpenNebula cluster #{cid}: #{rc.message}. You may have to place this datastore in the right cluster by hand"
+                                end
+                            end
+
+                            if !d[:cluster].empty?
+                                one_cluster = VCenterDriver::VIHelper.one_item(OpenNebula::Cluster, "0", false)
+                                if ::OpenNebula.is_error?(one_cluster)
+                                    STDOUT.puts "    \n    Error retrieving default cluster: #{rc.message}"
+                                end
+                                rc = one_cluster.deldatastore(one_d.id)
+                                if ::OpenNebula.is_error?(rc)
+                                    STDOUT.puts "    \n    Error removing datastore #{one_d.id} from default datastore."
                                 end
                             end
                         end