diff --git a/src/datastore_mad/remotes/vmfs/clone b/src/datastore_mad/remotes/vmfs/clone
index a87cf413af..a605306ec6 100755
--- a/src/datastore_mad/remotes/vmfs/clone
+++ b/src/datastore_mad/remotes/vmfs/clone
@@ -66,8 +66,8 @@ DST_FOLDER=`basename $DST`
 DST_HOST=`get_destination_host $(dirname $0)`
 
 if [ "$SSH" != "yes" ]; then
-    USERNAME=`echo $(cat $VMWARERC |grep ":username:"|cut -d":" -f 3)`
-    PASSWORD=`echo $(cat $VMWARERC |grep ":password:"|cut -d":" -f 3)`
+    USERNAME=`echo $(cat $VMWARERC |grep ":username:"|cut -d":" -f 3|tr -d '"')`
+    PASSWORD=`echo $(cat $VMWARERC |grep ":password:"|cut -d":" -f 3|tr -d '"')`
     VI_PARAMS="--server $DST_HOST --username $USERNAME --password $PASSWORD"
 fi
 
diff --git a/src/datastore_mad/remotes/vmfs/cp b/src/datastore_mad/remotes/vmfs/cp
index da6063fbbd..b2d0534507 100755
--- a/src/datastore_mad/remotes/vmfs/cp
+++ b/src/datastore_mad/remotes/vmfs/cp
@@ -51,6 +51,7 @@ unset i XPATH_ELEMENTS
 while IFS= read -r -d '' element; do
     XPATH_ELEMENTS[i++]="$element"
 done < <($XPATH     /DS_DRIVER_ACTION_DATA/DATASTORE/BASE_PATH \
+                    /DS_DRIVER_ACTION_DATA/DATASTORE/ID \
                     /DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/RESTRICTED_DIRS \
                     /DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/SAFE_DIRS \
                     /DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/UMASK \
@@ -59,22 +60,25 @@ done < <($XPATH     /DS_DRIVER_ACTION_DATA/DATASTORE/BASE_PATH \
                     /DS_DRIVER_ACTION_DATA/IMAGE/TEMPLATE/SHA1)
 
 BASE_PATH="${XPATH_ELEMENTS[0]}"
-RESTRICTED_DIRS="${XPATH_ELEMENTS[1]}"
-SAFE_DIRS="${XPATH_ELEMENTS[2]}"
-UMASK="${XPATH_ELEMENTS[3]}"
-SRC="${XPATH_ELEMENTS[4]}"
-MD5="${XPATH_ELEMENTS[5]}"
-SHA1="${XPATH_ELEMENTS[6]}"
+DS_ID="${XPATH_ELEMENTS[1]}"
+RESTRICTED_DIRS="${XPATH_ELEMENTS[2]}"
+SAFE_DIRS="${XPATH_ELEMENTS[3]}"
+UMASK="${XPATH_ELEMENTS[4]}"
+SRC="${XPATH_ELEMENTS[5]}"
+MD5="${XPATH_ELEMENTS[6]}"
+SHA1="${XPATH_ELEMENTS[7]}"
 
 # Set up the datastore
 set_up_datastore "$BASE_PATH" "$RESTRICTED_DIRS" "$SAFE_DIRS" "$UMASK"
 
 DST=`generate_image_path`
+DST_FOLDER=`basename $DST`
+DST="/vmfs/volumes/$DS_ID/$DST_FOLDER"
 DST_HOST=`get_destination_host $(dirname $0)`
 
 if [ "$SSH" != "yes" ]; then
-    USERNAME=`echo $(cat $VMWARERC |grep ":username:"|cut -d":" -f 3)`
-    PASSWORD=`echo $(cat $VMWARERC |grep ":password:"|cut -d":" -f 3)`
+    USERNAME=`echo $(cat $VMWARERC |grep ":username:"|cut -d":" -f 3|tr -d '"')`
+    PASSWORD=`echo $(cat $VMWARERC |grep ":password:"|cut -d":" -f 3|tr -d '"')`
     VI_PARAMS="--server $DST_HOST --username $USERNAME --password $PASSWORD"
 fi
 
@@ -82,7 +86,7 @@ fi
 if [ "$SSH" == "yes" ]; then
     ssh_make_path $DST_HOST $DST
 else
-    exec_and_log "vifs $VI_PARAMS --mkdir $DST" "Cannot create $DST in $DST_HOST"
+    exec_and_log "vifs $VI_PARAMS --mkdir \"[$DS_ID] $DST_FOLDER\"" "Cannot create $DST in $DST_HOST"
 fi
 
 # Prepare for a possible download in the front-end
@@ -143,7 +147,7 @@ else
     cd $SRC
     for file in $(find . -type f); do
         FNAME=$(basename $file)
-        exec_and_log "vifs $VI_PARAMS -p $file $DST/$FNAME" "Cannot upload $file to $DST/$FNAME on $DST_HOST"
+        exec_and_log "vifs $VI_PARAMS -p $file \"[$DS_ID] $DST_FOLDER/$FNAME\"" "Cannot upload $file to $DST/$FNAME on $DST_HOST"
     done
 fi
 
diff --git a/src/datastore_mad/remotes/vmfs/mkfs b/src/datastore_mad/remotes/vmfs/mkfs
index 0abb8df4c0..b99eb1003b 100755
--- a/src/datastore_mad/remotes/vmfs/mkfs
+++ b/src/datastore_mad/remotes/vmfs/mkfs
@@ -72,8 +72,8 @@ DST_FOLDER_NAME=`basename $DST`
 DST_HOST=`get_destination_host $(dirname $0)`
 
 if [ "$SSH" != "yes" ]; then
-    USERNAME=`echo $(cat $VMWARERC |grep ":username:"|cut -d":" -f 3)`
-    PASSWORD=`echo $(cat $VMWARERC |grep ":password:"|cut -d":" -f 3)`
+    USERNAME=`echo $(cat $VMWARERC |grep ":username:"|cut -d":" -f 3|tr -d '"')`
+    PASSWORD=`echo $(cat $VMWARERC |grep ":password:"|cut -d":" -f 3|tr -d '"')`
     REMOTE_DS_ROUTE="$IMAGE_DS_ID]$DST_FOLDER_NAME"
     VI_PARAMS="--server $DST_HOST --username $USERNAME --password $PASSWORD"
 fi
diff --git a/src/datastore_mad/remotes/vmfs/rm b/src/datastore_mad/remotes/vmfs/rm
index c4c6b5c035..4e188c2d82 100755
--- a/src/datastore_mad/remotes/vmfs/rm
+++ b/src/datastore_mad/remotes/vmfs/rm
@@ -58,8 +58,8 @@ DST_HOST=`get_destination_host $(dirname $0)`
 FOLDER_TO_ERASE=`dirname SRC`
 
 if [ "$SSH" != "yes" ]; then
-    USERNAME=`echo $(cat $VMWARERC |grep ":username:"|cut -d":" -f 3)`
-    PASSWORD=`echo $(cat $VMWARERC |grep ":password:"|cut -d":" -f 3)`
+    USERNAME=`echo $(cat $VMWARERC |grep ":username:"|cut -d":" -f 3|tr -d '"')`
+    PASSWORD=`echo $(cat $VMWARERC |grep ":password:"|cut -d":" -f 3|tr -d '"')`
     VI_PARAMS="--server $DST_HOST --username $USERNAME --password $PASSWORD"
 fi
 
diff --git a/src/tm_mad/vmware/clone b/src/tm_mad/vmware/clone
index 883f060e43..56a526093c 100755
--- a/src/tm_mad/vmware/clone
+++ b/src/tm_mad/vmware/clone
@@ -53,8 +53,8 @@ DST_HOST=`arg_host $DST`
 DST_DIR=`dirname $DST_PATH`
 
 if [ "$SSH" != "yes" ]; then
-    USERNAME=`echo $(cat $VMWARERC |grep ":username:"|cut -d":" -f 3)`
-    PASSWORD=`echo $(cat $VMWARERC |grep ":password:"|cut -d":" -f 3)`
+    USERNAME=`echo $(cat $VMWARERC |grep ":username:"|cut -d":" -f 3|tr -d '"')`
+    PASSWORD=`echo $(cat $VMWARERC |grep ":password:"|cut -d":" -f 3|tr -d '"')`
 	IMAGE_DS_NAME=`basename $(dirname $SRC_PATH)`
     SYSTEM_DS_NAME=`basename $(dirname $(dirname $DST_PATH))`
     DST_DIR_WITHOUT_DS_PATH="[$SYSTEM_DS_NAME] ${DST_PATH##"$DS_DIR/$SYSTEM_DS_NAME/"}"
diff --git a/src/tm_mad/vmware/context b/src/tm_mad/vmware/context
index a501980d1c..3c7d8b57ba 100755
--- a/src/tm_mad/vmware/context
+++ b/src/tm_mad/vmware/context
@@ -50,8 +50,8 @@ DST_HOST=`arg_host $DST`
 DST_DIR=`dirname $DST_PATH`
 
 if [ "$SSH" != "yes" ]; then
-    USERNAME=`echo $(cat $VMWARERC |grep ":username:"|cut -d":" -f 3)`
-    PASSWORD=`echo $(cat $VMWARERC |grep ":password:"|cut -d":" -f 3)`
+    USERNAME=`echo $(cat $VMWARERC |grep ":username:"|cut -d":" -f 3|tr -d '"')`
+    PASSWORD=`echo $(cat $VMWARERC |grep ":password:"|cut -d":" -f 3|tr -d '"')`
     VI_PARAMS="--server $DST_HOST --username $USERNAME --password $PASSWORD"
 fi
 
diff --git a/src/tm_mad/vmware/delete b/src/tm_mad/vmware/delete
index 19cbd901fd..746f28b124 100755
--- a/src/tm_mad/vmware/delete
+++ b/src/tm_mad/vmware/delete
@@ -55,8 +55,8 @@ log "Deleting $DST_PATH"
 if [ "$SSH" == "yes" ]; then
 	ssh_exec_and_log $DST_HOST "rm -rf $DST_PATH" "Error deleting $DST_PATH"
 else
-	USERNAME=`echo $(cat $VMWARERC |grep ":username:"|cut -d":" -f 3)`
-	PASSWORD=`echo $(cat $VMWARERC |grep ":password:"|cut -d":" -f 3)`
+	USERNAME=`echo $(cat $VMWARERC |grep ":username:"|cut -d":" -f 3|tr -d '"')`
+	PASSWORD=`echo $(cat $VMWARERC |grep ":password:"|cut -d":" -f 3|tr -d '"')`
 	exec_and_log "$VMKFSTOOLS --server $DST_HOST --username $USERNAME --password $PASSWORD -U $DST_PATH" "Cannot delelete $DST"
 fi
 
diff --git a/src/tm_mad/vmware/mkimage b/src/tm_mad/vmware/mkimage
index babe4a6c66..3b96b0b79a 100755
--- a/src/tm_mad/vmware/mkimage
+++ b/src/tm_mad/vmware/mkimage
@@ -52,8 +52,8 @@ DST_DIR=`dirname $DST_PATH`
 
 if [ "$SSH" != "yes" ]; then
     SYSTEM_DS_NAME=`basename $(dirname $(dirname $DST_PATH))`
-    USERNAME=`echo $(cat $VMWARERC |grep ":username:"|cut -d":" -f 3)`
-    PASSWORD=`echo $(cat $VMWARERC |grep ":password:"|cut -d":" -f 3)`
+    USERNAME=`echo $(cat $VMWARERC |grep ":username:"|cut -d":" -f 3|tr -d '"')`
+    PASSWORD=`echo $(cat $VMWARERC |grep ":password:"|cut -d":" -f 3|tr -d '"')`
     DST_DIR_WITHOUT_DS_PATH="[$SYSTEM_DS_NAME] ${DST_PATH##"$DS_DIR/$SYSTEM_DS_NAME/"}"
     VI_PARAMS="--server $DST_HOST --username $USERNAME --password $PASSWORD"
 fi
diff --git a/src/tm_mad/vmware/mvds b/src/tm_mad/vmware/mvds
index b69e14c54f..25886030dd 100755
--- a/src/tm_mad/vmware/mvds
+++ b/src/tm_mad/vmware/mvds
@@ -43,8 +43,8 @@ fi
 source $(dirname $0)/tm_vmwarerc
 
 if [ "$SSH" != "yes" ]; then
-    USERNAME=`echo $(cat $VMWARERC |grep ":username:"|cut -d":" -f 3)`
-    PASSWORD=`echo $(cat $VMWARERC |grep ":password:"|cut -d":" -f 3)`
+    USERNAME=`echo $(cat $VMWARERC |grep ":username:"|cut -d":" -f 3|tr -d '"')`
+    PASSWORD=`echo $(cat $VMWARERC |grep ":password:"|cut -d":" -f 3|tr -d '"')`
     VI_PARAMS="--server $DST_HOST --username $USERNAME --password $PASSWORD"
 fi