diff --git a/data/system/boot/Bootscript b/data/system/boot/Bootscript
index 5540020f2f..c4c923be3d 100644
--- a/data/system/boot/Bootscript
+++ b/data/system/boot/Bootscript
@@ -102,6 +102,10 @@ fi
 
 # Now ask the user if he wants to run the Installer or continue to the Desktop.
 if [ "$isReadOnly" = "yes" ]; then
+	# Create Installer links (using the write overlay)
+	ln -sf /boot/system/apps/Installer /boot/home/Desktop/Installer
+	ln -sf /boot/system/apps/Installer /boot/home/config/be/Applications/Installer
+
 	/bin/alert "Do you wish to run the Installer or continue booting to the Desktop?" "Installer" "Desktop"
 	if [ $? -eq 0 ]; then
 		launchscript $SCRIPTS/Bootscript.cd
diff --git a/data/system/boot/Bootscript.cd b/data/system/boot/Bootscript.cd
index dee9e925bc..8eebd37806 100644
--- a/data/system/boot/Bootscript.cd
+++ b/data/system/boot/Bootscript.cd
@@ -45,19 +45,13 @@ runprog() {
 ##
 
 
-# Launch Terminal or consoled depending on $SAFEMODE
-if [ "$SAFEMODE" != "yes" ]; then
-	cd /boot/home
-	if [ -x /boot/system/apps/Installer ]; then
-		/boot/system/apps/Installer
-		#/boot/system/apps/Terminal -x /boot/system/apps/Installer
-	else
-		/boot/system/apps/Terminal
-	fi
-	#launch system/apps/Terminal
+# Launch Installer
+
+cd /boot/home
+if [ -x /boot/system/apps/Installer ]; then
+	/boot/system/apps/Installer
 else
-	launch system/bin/consoled
-	exit 0 # return so we don't eject and reboot
+	/boot/system/apps/Terminal
 fi
 
 # sync disks
diff --git a/data/system/boot/InstallerFinishScript b/data/system/boot/InstallerFinishScript
index 6e52cc7844..a105f98864 100644
--- a/data/system/boot/InstallerFinishScript
+++ b/data/system/boot/InstallerFinishScript
@@ -1,19 +1,22 @@
 #!/bin/sh
 ## The installer finish script.
 
-mount=$1
+target=$1
 
-if [ -z "$mount" ]; then
-	echo "Usage: $0 volume"
+if [ -z "$target" ]; then
+	echo "Usage: $0 <volume>"
 	exit 1
 fi
 
-if [ ! -d "$mount" ]; then
-	echo "$mount isn't mounted"
+if [ ! -d "$target" ]; then
+	echo "$target isn't mounted"
 	exit 1
 fi
 
-mkdir -p "$mount/var/tmp"
+mkdir -p "$target/var/tmp"
 
-makebootable "$mount"
+# remove Installer links
+rm -f $target/home/Desktop/Installer
+rm -f $target/home/config/be/Applications/Installer
 
+makebootable "$target"