diff --git a/share/hooks/image.rb b/share/hooks/image.rb
index e04d337920..22c92f6279 100755
--- a/share/hooks/image.rb
+++ b/share/hooks/image.rb
@@ -61,13 +61,13 @@ vm.each('TEMPLATE/DISK') do |disk|
         exit -1 if OpenNebula.is_error?(result)
 
         # Disable the Image for a safe overwriting
-        image.disable 
+        # image.disable
     
         # Save the image file
         result = image.move(source_path, image['SOURCE']) 
         
         exit -1 if OpenNebula.is_error?(result)
     
-        image.enable
+        # image.enable
     end
 end
diff --git a/src/cli/onevm b/src/cli/onevm
index 65d3062ec8..73b49d3efe 100755
--- a/src/cli/onevm
+++ b/src/cli/onevm
@@ -716,7 +716,7 @@ when "saveas"
     end
     
     # Build the template and allocate the new Image
-    template = "NAME=#{image_name}\n"
+    template = "NAME=\"#{image_name}\"\n"
     template << "TYPE=#{image_type}\n" if image_type