diff --git a/src/freedombone-utils-webadmin b/src/freedombone-utils-webadmin
index c671ad6a03a6437f02e406dced7992ebae8eb42f..7f0819b7eda0e5f0d05ef16a6d7d7ab346aa890b 100755
--- a/src/freedombone-utils-webadmin
+++ b/src/freedombone-utils-webadmin
@@ -486,6 +486,7 @@ function web_admin_onion_only {
     sed -i '/freedns_code/d' "$webadmin_install_dir/app_add_template.html"
     sed -i '/install_domain/d' "$webadmin_install_dir/app_add_template.html"
     sed -i 's|onion_only=false;|onion_only=true;|g' "$webadmin_install_dir/installapp.php"
+    sed -i 's|setup_domain.html|setup_installing.html|g' "$webadmin_install_dir/setupconfirm.php"
 }
 
 function web_admin_reset {
diff --git a/webadmin/setupconfirm.php b/webadmin/setupconfirm.php
index 3fb3f744e0942e63e83b6c69a4b945012eb960c3..be182c04c836704a2394d31adf5df917370eaa5d 100755
--- a/webadmin/setupconfirm.php
+++ b/webadmin/setupconfirm.php
@@ -8,8 +8,14 @@ if (isset($_POST['setupconfirmsubmit'])) {
 
         if($confirm == "1") {
             if(file_exists("setup.txt")) {
+                // This gets changed by web_admin_onion_only
                 $output_filename = "setup_domain.html";
             }
+            if($output_filename == "setup_installing.html") {
+                if(file_exists(".temp_setup.txt")) {
+                    exec('mv .temp_setup.txt setup.txt');
+                }
+            }
         }
     }
 }