diff --git a/src/tm_mad/vmfs/mvds b/src/tm_mad/vmfs/mvds
index c3f4f09d9e..7272eb735b 100755
--- a/src/tm_mad/vmfs/mvds
+++ b/src/tm_mad/vmfs/mvds
@@ -42,13 +42,6 @@ fi
 
 source $(dirname $0)/tm_vmfsrc
 
-if [ "$USE_SSH" != "yes" ]; then
-	DST_HOST=`arg_host $DST`
-    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
-
 set_ds_location
 
 #-------------------------------------------------------------------------------
@@ -59,6 +52,12 @@ DST_PATH=`arg_path $DST`
 DST_PATH="$RMT_DS_DIR/${DST_PATH##"$DS_DIR/"}/disk.vmdk"
 SRC_HOST=`arg_host $SRC`
 
+if [ "$USE_SSH" != "yes" ]; then
+    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 $SRC_HOST --username $USERNAME --password $PASSWORD"
+fi
+
 #-------------------------------------------------------------------------------
 # Move the image back to the datastore
 #-------------------------------------------------------------------------------