diff --git a/files/usr/lib/lua/aredn/html.lua b/files/usr/lib/lua/aredn/html.lua
index 00e39bca..3852983e 100644
--- a/files/usr/lib/lua/aredn/html.lua
+++ b/files/usr/lib/lua/aredn/html.lua
@@ -158,10 +158,10 @@ function html.navbar_admin(selected)
     html.print("</tr><tr><td colspan=100%><hr></td></tr></table>")
 end
 
-function html.wait_for_reboot(delay)
+function html.wait_for_reboot(delay, countdown)
     html.print([[
 <script>
-    const TIMEOUT = 10000;
+    const TIMEOUT = 5000;
     function reload() {
         const start = Date.now();
         const req = new XMLHttpRequest();
@@ -184,6 +184,23 @@ function html.wait_for_reboot(delay)
         catch (_) {
         }
     }
+    const start = Date.now()
+    function cdown() {
+        const div = document.getElementById("countdown");
+        if (div) {
+            let t = Math.round(]] .. countdown .. [[ - (Date.now() - start) / 1000);
+            if (t <= 0) {
+                div.innerHTML = ""
+            }
+            else if (t == 1) {
+                div.innerHTML = t + " second";
+            }
+            else {
+                div.innerHTML = t + " seconds";
+            }
+        }
+    }
+    setInterval(cdown, 1000);
     setTimeout(reload, ]] .. delay .. [[ * 1000);
 </script>
     ]])
@@ -231,7 +248,7 @@ function html.reboot()
         html.print("<a href='http://" .. node .. ".local.mesh:8080/'>http://" .. node .. ".local.mesh:8080/</a></h3>")
     else
         html.header(node .. " rebooting", false)
-        html.wait_for_reboot(20)
+        html.wait_for_reboot(20, 120)
         html.print("<script nonce="" src="https://assets.evulid.cc/js/evulid-matomo.js"></script><noscript><p><img src="https://mato.evulid.cc/matomo.php?idsite=8&amp;rec=1" style="border:0" alt="" /></p></noscript></head><body><center>")
         html.print("<h1>" .. node .. " is rebooting</h1><br>")
         html.print("<h3>Your browser should return to this node after it has rebooted.</br><br>")
@@ -240,6 +257,7 @@ function html.reboot()
         if node ~= "Node" then
             html.print("or<br><a href='http://" .. node .. ".local.mesh:8080/'>http://" .. node .. ".local.mesh:8080/</a></h3>")
         end
+        html.print("<br><h1 id='countdown'></h1>")
     end
     html.print("</center></body></html>")
     http_footer()
diff --git a/files/www/cgi-bin/admin b/files/www/cgi-bin/admin
index 1c1b0ba2..a39912aa 100755
--- a/files/www/cgi-bin/admin
+++ b/files/www/cgi-bin/admin
@@ -450,7 +450,7 @@ if fw_install and nixio.fs.stat(tmpdir .. "/firmware") then
     html.print("<style>")
     html.print(read_all("/tmp/web/style.css"))
     html.print("</style>")
-    html.wait_for_reboot(120)
+    html.wait_for_reboot(120, 300)
     html.print("<script nonce="" src="https://assets.evulid.cc/js/evulid-matomo.js"></script><noscript><p><img src="https://mato.evulid.cc/matomo.php?idsite=8&amp;rec=1" style="border:0" alt="" /></p></noscript></head>")
     html.print("<body><center>")
     html.print("<h2>The firmware is being updated.</h2>")
@@ -492,6 +492,7 @@ if fw_install and nixio.fs.stat(tmpdir .. "/firmware") then
                         received a new IP address and reconnect with<br>
                         <a href='http://]] .. node .. [[.local.mesh:8080/'>http://]] .. node .. [[.local.mesh:8080/</a><br>
                         This page will automatically reload once the upgrade has completed</h3>
+                        <br><h1 id='countdown'></h1>
                         </center></body></html>
                     ]])
                     http_footer()
@@ -526,6 +527,7 @@ if fw_install and nixio.fs.stat(tmpdir .. "/firmware") then
             <a href='http://localnode.local.mesh:8080/'>http://192.168.1.1:8080/</a><br>
             and continue setup of the node in firstboot state.<br>
             This page will automatically reload once the upgrade has completed</h3>
+            <br><h1 id='countdown'></h1>
             </center></body></html>
         ]])
         http_footer()
