diff --git a/iso/installer/install.sh b/iso/installer/install.sh
index a59ce738..08a1eede 100755
--- a/iso/installer/install.sh
+++ b/iso/installer/install.sh
@@ -153,6 +153,7 @@ if [ -f "dialogrc" ];
   else
     echo "[ NOT OK ]"
     echo "### 'dialogrc' is missing. Please run 'install.sh' from within the setup folder."
+    exit
   fi
 }
 
@@ -193,6 +194,7 @@ fuGET_DEPS
 fuCHECK_PORTS
 fuDIALOG_SETUP
 
+
 #############
 # Installer #
 #############
diff --git a/iso/installer/keys/authorized_keys b/iso/installer/keys/authorized_keys
deleted file mode 100644
index 8b137891..00000000
--- a/iso/installer/keys/authorized_keys
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/iso/installer/rc.local.install b/iso/installer/rc.local.install
index 021ef1bf..41e3d29a 100755
--- a/iso/installer/rc.local.install
+++ b/iso/installer/rc.local.install
@@ -1,3 +1,4 @@
 #!/bin/bash
 plymouth --quit
-openvt -f -w -s /root/installer/install.sh
+cd /root/installer
+openvt -f -w -s install.sh --type=iso
diff --git a/makeiso.sh b/makeiso.sh
index a33c665b..e6e70a98 100755
--- a/makeiso.sh
+++ b/makeiso.sh
@@ -14,7 +14,6 @@ myTPOTISO="tpot.iso"
 myTPOTDIR="tpotiso"
 myTPOTSEED="iso/preseed/tpot.seed"
 myPACKAGES="dialog genisoimage syslinux syslinux-utils pv udisks2"
-myAUTHKEYSFILE="iso/installer/keys/authorized_keys"
 myPFXFILE="iso/installer/keys/8021x.pfx"
 myINSTALLERPATH="iso/installer/install.sh"
 myNTPCONFFILE="iso/installer/ntp.conf"
@@ -56,7 +55,6 @@ cp host/etc/dialogrc /etc/
 # Let's clean up at the end or if something goes wrong ...
 function fuCLEANUP {
 rm -rf $myTMP $myTPOTDIR $myPFXFILE $myNTPCONFFILE $myCONF_FILE
-echo > $myAUTHKEYSFILE
 if [ -f $myTPOTSEED.bak ];
   then
     mv $myTPOTSEED.bak $myTPOTSEED