diff --git a/usr/local/www/diag_defaults.php b/usr/local/www/diag_defaults.php
index 86ea6f9c8e..d5116ff305 100755
--- a/usr/local/www/diag_defaults.php
+++ b/usr/local/www/diag_defaults.php
@@ -44,15 +44,9 @@
 
 require("guiconfig.inc");
 
-if ($_POST) {
-	if ($_POST['Submit'] != " No ") {
-		reset_factory_defaults();
-		system_reboot();
-		$rebootmsg = gettext("The system has been reset to factory defaults and is now rebooting. This may take a few minutes, depending on your hardware.");
-	} else {
-		header("Location: index.php");
-		exit;
-	}
+if ($_POST['Submit'] == " " . gettext("No") . " ") {
+	header("Location: index.php");
+	exit;
 }
 
 $pgtitle = array(gettext("Diagnostics"),gettext("Factory defaults"));
@@ -62,7 +56,16 @@ include("head.inc");
 
 <body link="#0000CC" vlink="#0000CC" alink="#0000CC">
 <?php include("fbegin.inc"); ?>
-<?php if ($rebootmsg): echo print_info_box($rebootmsg); else: ?>
+
+<?php if ($_POST['Submit'] == " " . gettext("Yes") . " "):
+	print_info_box(gettext("The system has been reset to factory defaults and is now rebooting. This may take a few minutes, depending on your hardware.")); ?>
+<pre>
+<?php
+	reset_factory_defaults();
+	system_reboot();
+?>
+</pre>
+<?php else: ?>
 <form action="diag_defaults.php" method="post">
               <p><strong> <?=gettext("If you click") . " &quot;" . gettext("Yes") . "&quot;, " . gettext("the firewall will:")?>
 
