diff --git a/src/freedombone-installer b/src/freedombone-installer
index c11eed60d98157361b0d3e856f4fbab8693ad20f..347d3d2a257affa83113fc2b6e87d7d8a201fa38 100755
--- a/src/freedombone-installer
+++ b/src/freedombone-installer
@@ -219,13 +219,13 @@ function run_setup_command {
       echo '    touch /root/.running_install_command';
       echo 'fi';
       echo '';
-      echo "if [ -f $webadmin_install_dir/log.txt ]; then";
-      echo "    rm $webadmin_install_dir/log.txt";
-      echo 'fi';
+      echo "echo \"Beginning install $(date)\" > $webadmin_install_dir/log.txt";
+      echo "chown www-data:www-data $webadmin_install_dir/log.txt";
       echo '';
-      echo "if ! /usr/local/bin/freedombone -c \"$CONFIGURATION_FILE\" > /root/.install_progress; then";
+      echo "/usr/local/bin/freedombone -c \"$CONFIGURATION_FILE\" > $webadmin_install_dir/log.txt;";
+
+      echo "if ! grep -q 'install_final' \"$COMPLETION_FILE\"; then";
       echo '    rm /root/.running_install_command';
-      echo "    cp /root/.install_progress $webadmin_install_dir/log.txt";
       echo "    chown www-data:www-data $webadmin_install_dir/log.txt";
       echo "    if [ -f $setup_file ]; then";
       echo "        rm $setup_file";
@@ -236,7 +236,6 @@ function run_setup_command {
       echo '    exit 364873';
       echo 'fi';
       echo '';
-      echo "cp /root/.install_progress $webadmin_install_dir/log.txt";
       echo "chown www-data:www-data $webadmin_install_dir/log.txt";
       echo '';
       echo 'if [ -f /root/.running_install_command ]; then';