diff --git a/src/freedombone b/src/freedombone
index d23413e6..48127243 100755
--- a/src/freedombone
+++ b/src/freedombone
@@ -11946,7 +11946,9 @@ function install_final {
       echo "See /home/$MY_USERNAME/README for post-installation instructions."
       echo ''
   fi
-  reboot
+  if [ ! -f $IMAGE_PASSWORD_FILE ]; then
+	  reboot
+  fi
 }
 
 
diff --git a/src/freedombone-image-customise b/src/freedombone-image-customise
index de74b514..808ad523 100755
--- a/src/freedombone-image-customise
+++ b/src/freedombone-image-customise
@@ -275,7 +275,9 @@ EOF
     echo "            rm /root/.initial_setup" >> $rootdir/root/.bashrc
     echo "            rm /home/${MY_USERNAME}/.initial_setup" >> $rootdir/root/.bashrc
     echo "            shred -zu ~/login.txt" >> $rootdir/root/.bashrc
-    cat >> $rootdir/root/.bashrc <<EOF
+    echo "            dialog --title 'Congratulations!' --msgbox '\nYour Freedombone system has now installed\n\nPress any key to reboot and begin using it' 9 50" >> $rootdir/root/.bashrc
+	cat >> $rootdir/root/.bashrc <<EOF
+            reboot
         fi
     fi
     exit