diff --git a/usr/local/www/diag_backup.php b/usr/local/www/diag_backup.php
index 114089dac5..1b67fee8e8 100644
--- a/usr/local/www/diag_backup.php
+++ b/usr/local/www/diag_backup.php
@@ -203,26 +203,28 @@ function spit_out_select_items($name, $showall) {
 		);
 
 	$select  = "<select name=\"{$name}\" id=\"{$name}\">";
-	$select .= "<option VALUE=\"\">" . gettext("ALL") . "</option>";
+	$select .= "<option value=\"\">" . gettext("ALL") . "</option>";
 
 	if($showall == true)
 		foreach($areas as $area => $areaname)
-			$select .= "<option value='{$area}'>{$areaname}</option>\n";
+			$select .= "<option value=\"{$area}\">{$areaname}</option>\n";
 	else
 		foreach($areas as $area => $areaname)
 			if($area === "rrddata" || check_and_returnif_section_exists($area) == true)
-				$select .= "<option value='{$area}'>{$areaname}</option>\n";
+				$select .= "<option value=\"{$area}\">{$areaname}</option>\n";
 
 	$select .= "</select>\n";
 
 	if ($name === "backuparea") {
 		$select .= <<<END_SCRIPT_BLOCK
-			<script type='text/javascript'>
+			<script type="text/javascript">
+			//<![CDATA[
 				jQuery(function (\$) {
 					$("#{$name}").change(function () {
 						backuparea_change(this);
 					}).trigger("change");
 				});
+			//]]>
 			</script>
 END_SCRIPT_BLOCK;
 	}
@@ -587,7 +589,7 @@ include("head.inc");
 <body link="#0000CC" vlink="#0000CC" alink="#0000CC">
 <?php include("fbegin.inc"); ?>
 <script type="text/javascript">
-<!--
+//<![CDATA[
 
 function encrypt_change() {
 
@@ -614,19 +616,19 @@ function backuparea_change(obj) {
 		document.getElementById("dotnotbackuprrd").disabled = false;
 	}
 }
-//-->
+//]]>
 </script>
 
 <?php if ($input_errors) print_input_errors($input_errors); ?>
 <?php if ($savemsg) print_info_box($savemsg); ?>
-<?php if (is_subsystem_dirty('restore')): ?><p>
+<?php if (is_subsystem_dirty('restore')): ?><br/>
 <form action="reboot.php" method="post">
-<input name="Submit" type="hidden" value=" Yes ">
+<input name="Submit" type="hidden" value="Yes" />
 <?php print_info_box(gettext("The firewall configuration has been changed.") . "<br />" . gettext("The firewall is now rebooting."));?><br />
 </form>
 <?php endif; ?>
 <form action="diag_backup.php" method="post" name="iform" enctype="multipart/form-data">
-<table width="100%" border="0" cellspacing="0" cellpadding="0">
+<table width="100%" border="0" cellspacing="0" cellpadding="0" summary="diag backup">
 	<tr>
 		<td>
 <?php
@@ -640,7 +642,7 @@ function backuparea_change(obj) {
 	<tr>
 		<td>
 			<div id="mainarea">
-			<table class="tabcont" align="center" width="100%" border="0" cellpadding="6" cellspacing="0">
+			<table class="tabcont" align="center" width="100%" border="0" cellpadding="6" cellspacing="0" summary="main area">
 				<tr>
 					<td colspan="2" class="listtopic"><?=gettext("Backup configuration"); ?></td>
 				</tr>
@@ -651,7 +653,7 @@ function backuparea_change(obj) {
 						<table>
 							<tr>
 								<td>
-									<input name="nopackages" type="checkbox" class="formcheckbox" id="nopackages">
+									<input name="nopackages" type="checkbox" class="formcheckbox" id="nopackages" />
 								</td>
 								<td>
 									<span class="vexpl"><?=gettext("Do not backup package information."); ?></span>
@@ -661,7 +663,7 @@ function backuparea_change(obj) {
 						<table>
 							<tr>
 								<td>
-									<input name="encrypt" type="checkbox" class="formcheckbox" id="nopackages" onClick="encrypt_change()">
+									<input name="encrypt" type="checkbox" class="formcheckbox" id="nopackages" onclick="encrypt_change()" />
 								</td>
 								<td>
 									<span class="vexpl"><?=gettext("Encrypt this configuration file."); ?></span>
@@ -669,7 +671,7 @@ function backuparea_change(obj) {
 							</tr>
 							<tr>
 								<td>
-									<input name="donotbackuprrd" type="checkbox" class="formcheckbox" id="dotnotbackuprrd" checked>
+									<input name="donotbackuprrd" type="checkbox" class="formcheckbox" id="dotnotbackuprrd" checked="checked" />
 								</td>
 								<td>
 									<span class="vexpl"><?=gettext("Do not backup RRD data (NOTE: RRD Data can consume 4+ megabytes of config.xml space!)"); ?></span>
@@ -694,7 +696,7 @@ function backuparea_change(obj) {
 								</td>
 							</tr>
 						</table>
-						<p><input name="Submit" type="submit" class="formbtn" id="download" value="<?=gettext("Download configuration"); ?>"></p>
+						<p><input name="Submit" type="submit" class="formbtn" id="download" value="<?=gettext("Download configuration"); ?>" /></p>
 					</td>
 				</tr>
 				<tr>
@@ -709,11 +711,11 @@ function backuparea_change(obj) {
 						<?=gettext("Open a"); ?> <?=$g['[product_name']?> <?=gettext("configuration XML file and click the button below to restore the configuration."); ?>
 						<br /><br />
 						<?=gettext("Restore area:"); ?> <?php spit_out_select_items("restorearea", true); ?>
-						<p><input name="conffile" type="file" class="formbtn" id="conffile" size="40"></p>
+						<p><input name="conffile" type="file" class="formbtn" id="conffile" size="40" /></p>
 						<table>
 							<tr>
 								<td>
-									<input name="decrypt" type="checkbox" class="formcheckbox" id="nopackages" onClick="decrypt_change()">
+									<input name="decrypt" type="checkbox" class="formcheckbox" id="nopackages" onclick="decrypt_change()" />
 								</td>
 								<td>
 									<span class="vexpl"><?=gettext("Configuration file is encrypted."); ?></span>
@@ -738,7 +740,7 @@ function backuparea_change(obj) {
 								</td>
 							</tr>
 						</table>
-						<p><input name="Submit" type="submit" class="formbtn" id="restore" value="<?=gettext("Restore configuration"); ?>"></p>
+						<p><input name="Submit" type="submit" class="formbtn" id="restore" value="<?=gettext("Restore configuration"); ?>" /></p>
 						<p><strong><span class="red"><?=gettext("Note:"); ?></span></strong><br /><?=gettext("The firewall will reboot after restoring the configuration."); ?><br /></p>
 					</td>
 				</tr>
@@ -754,14 +756,15 @@ function backuparea_change(obj) {
 					<td width="78%" class="vtable">
 						<?php if ($config['installedpackages']['package'] != "") { ?>
 							<p><?=gettext("Click this button to reinstall all system packages.  This may take a while."); ?> <br /><br />
-							<input name="Submit" type="submit" class="formbtn" id="reinstallpackages" value="<?=gettext("Reinstall packages"); ?>">
+							<input name="Submit" type="submit" class="formbtn" id="reinstallpackages" value="<?=gettext("Reinstall packages"); ?>" />
 							<br />
 							<br />
 						<?php } ?>
 						<?php if (is_subsystem_dirty("packagelock")) { ?>
 							<p><?=gettext("Click this button to clear the package lock if a package fails to reinstall properly after an upgrade."); ?> <br /><br />
-							<input name="Submit" type="submit" class="formbtn" id="clearpackagelock" value="<?=gettext("Clear Package Lock"); ?>">
+							<input name="Submit" type="submit" class="formbtn" id="clearpackagelock" value="<?=gettext("Clear Package Lock"); ?>" />
 						<?php } ?>
+							</p>
 					</td>
 				</tr>
 				<?php } ?>
@@ -773,10 +776,10 @@ function backuparea_change(obj) {
 </form>
 
 <script type="text/javascript">
-<!--
+//<![CDATA[
 encrypt_change();
 decrypt_change();
-//-->
+//]]>
 </script>
 
 <?php include("fend.inc"); ?>
