diff --git a/dom0/qvm-core/qubes.py b/dom0/qvm-core/qubes.py
index ab4c594e..26f32f46 100755
--- a/dom0/qvm-core/qubes.py
+++ b/dom0/qvm-core/qubes.py
@@ -1137,6 +1137,13 @@ class QubesTemplateVm(QubesVm):
         if retcode != 0:
             raise IOError ("Error while copying {0} to {1}".\
                            format(self.clean_volatile_img, self.volatile_img))
+
+        if verbose:
+            print "--> Copying the template's DispVM prerun script..."
+        retcode = subprocess.call (["cp", src_template_vm.dir_path + '/dispvm-prerun.sh', self.dir_path + '/dispvm-prerun.sh'])
+        if retcode != 0:
+            raise IOError ("Error while copying DispVM prerun script")
+
         if verbose:
             print "--> Copying the template's appmenus templates dir:\n{0} ==>\n{1}".\
                     format(src_template_vm.appmenus_templates_dir, self.appmenus_templates_dir)
diff --git a/dom0/restore/qubes_update_dispvm_savefile_with_progress.sh b/dom0/restore/qubes_update_dispvm_savefile_with_progress.sh
index 74155ec5..aaaa5578 100755
--- a/dom0/restore/qubes_update_dispvm_savefile_with_progress.sh
+++ b/dom0/restore/qubes_update_dispvm_savefile_with_progress.sh
@@ -3,7 +3,7 @@ trap "exit 1" USR1 TERM
 export SHELL_PID=$$
 (
 	echo "1"
-	if ! qvm-create-default-dvm --default-template --default-script >/var/run/qubes/qvm-create-default-dvm.stdout </dev/null ; then 
+	if ! qvm-create-default-dvm --used-template --default-script >/var/run/qubes/qvm-create-default-dvm.stdout </dev/null ; then 
 		kill -USR1 $SHELL_PID
 	fi
         echo 100 
diff --git a/dom0/restore/qvm-create-default-dvm b/dom0/restore/qvm-create-default-dvm
index 75ffeeba..e3a819fb 100755
--- a/dom0/restore/qvm-create-default-dvm
+++ b/dom0/restore/qvm-create-default-dvm
@@ -1,16 +1,23 @@
 #!/bin/sh
 if [ $# != 1 -a $# != 2 ] ; then
-	echo 'Usage: qvm-create-default-dvm templatename|--default-template [script-name|--default-script]'
+	echo 'Usage: qvm-create-default-dvm templatename|--default-template|--used-template [script-name|--default-script]'
 	exit 1
 fi
-if [ "$1" = --default-template ] ; then
+export ROOT=/var/lib/qubes/dvmdata/savefile_root
+TEMPLATENAME=$1
+if [ "$TEMPLATENAME" = --used-template ] ; then
+	if [ -e $ROOT ] ; then
+		TEMPLATENAME=$(readlink $ROOT | sed -e 's/.root.img//' -e 's/.*\///')
+	else
+		TEMPLATENAME=--default-template
+	fi
+fi
+if [ "$TEMPLATENAME" = --default-template ] ; then
 	TEMPLATENAME=$(qvm-get-default-template)
 	if [ "X"$TEMPLATENAME = "X" ] ; then
 		echo No default template ?
 		exit 1
 	fi
-else
-	TEMPLATENAME=$1
 fi
 
 if [ "X""$2" = "X""--default-script" ] ; then
@@ -38,7 +45,6 @@ if ! /usr/lib/qubes/qubes_prepare_saved_domain.sh \
 	"$DVMTMPL" "/var/lib/qubes/appvms/$DVMTMPL/dvm-savefile" $SCRIPTNAME ; then
 	exit 1
 fi
-ROOT=/var/lib/qubes/dvmdata/savefile_root
 DEFAULT=/var/lib/qubes/dvmdata/default_savefile
 DEFAULTCONF=/var/lib/qubes/dvmdata/default_dvm.conf
 CURRENT=/var/run/qubes/current_savefile