diff --git a/admin/index.php b/admin/index.php
index f480977..3abe96b 100644
--- a/admin/index.php
+++ b/admin/index.php
@@ -18,7 +18,7 @@ case 'list_users':
 
 	?>
 	</pre>
-	<form action=<?php echo $PHP_SELF?> method=post>
+	<form action="<?php echo $PHP_SELF?>" method="post">
 	<input type=submit name=submit value="Back to Menu">
 	</form>
 	<?php
@@ -29,7 +29,7 @@ case 'add_user_form';
 	printHeader('admin');
 	?>
 	<body onLoad="self.focus();document.form.login.focus()">
-	<form action=<?php echo $PHP_SELF?> method=post name=form>
+	<form action="<?php echo $PHP_SELF?>" method="post" name="form">
 	<table>
 	<th colspan=2><h3>Add User or Change Password</h3></th>
 	<tr><td>User ID</td><td><input type=text name=login value="<?php echo htvar($login)?>" maxlength=15 size=15></td></tr>
@@ -49,7 +49,7 @@ case 'add_user':
 
 		?>
 		<p><center>
-		<form action=<?php echo $PHP_SELF?> method=post>
+		<form action="<?php echo $PHP_SELF?>" method="post">
 		<input type=hidden name=stage value=add_user_form>
 		<input type=hidden name=login value="<?php echo htvar($login)?>">
 		<input type=submit name=submit value=Back>
@@ -65,7 +65,7 @@ case 'add_user':
 		system("htpasswd -bm $pwdfile $login $passwd 2>&1")
 		?>
 		<p>
-		<form action=<?php echo $PHP_SELF?> method=post>
+		<form action="<?php echo $PHP_SELF?>" method="post">
 		<input type=submit name=submit value="Back to Menu">
 		</form>
 		<?php
@@ -76,8 +76,8 @@ case 'add_user':
 case 'del_user_form';
 	printHeader('admin');
 	?>
-	<body onLoad="self.focus();document.form.login.focus()">
-	<form action=<?php echo $PHP_SELF?> method=post name=form>
+	<body onLoad="self.focus();document.form.login.focus();">
+	<form action="<?php echo $PHP_SELF?>" method="post" name="form">
 	<table>
 	<th colspan=2><h3>Remove User</h3></th>
 	<tr><td>User ID</td><td><input type=text name=login value="<?php echo htvar($login)?>" maxlength=15 size=15></td></tr>
@@ -98,7 +98,7 @@ case 'del_user':
 	system("htpasswd -D $pwdfile $login 2>&1")
 	?>
 	<p>
-	<form action=<?php echo $PHP_SELF?> method=post>
+	<form action="<?php echo $PHP_SELF?>" method="post">
 	<input type=submit name=submit value="Back to Menu">
 	</form>
 	<?php
diff --git a/ca/main.php b/ca/main.php
index 0f88a3b..100f566 100644
--- a/ca/main.php
+++ b/ca/main.php
@@ -27,7 +27,7 @@ case 'gen_crl':
                 ?>
                 <center><h2>Certificate Revocation List Updated</h2></center>
                 <p>
-                <form action=<?php echo $PHP_SELF?> method=post>
+                <form action="<?php echo $PHP_SELF?>" method="post">
                 <input type=submit name=submit value="Back to Menu">
                 </form>
                 <?php
@@ -41,7 +41,7 @@ case 'gen_crl':
                 <h3>Debug Info:</h3>
                 <pre><?php echo $errtxt?></pre>
                 </blockquote>
-                <form action=<?php echo $PHP_SELF?> method=post>
+                <form action="<?php echo $PHP_SELF?>" method="post">
                 <p>
                 <input type=submit name=submit value="Back to Menu">
                 <p>
diff --git a/ca/request_cert.php b/ca/request_cert.php
index ed80685..d7e65ad 100644
--- a/ca/request_cert.php
+++ b/ca/request_cert.php
@@ -212,7 +212,7 @@ case 'final':
 	                	printHeader();
 
 				?>
-				<form action=<?php echo $PHP_SELF?> method=post>
+				<form action="<?php echo $PHP_SELF?>" method="post">
                 		<font color=#ff0000>
                 		<h2>There was an error creating your certificate.</h2></font><br>
 	                	<blockquote>
diff --git a/include/common.php b/include/common.php
index 7cc23a9..fa5b367 100644
--- a/include/common.php
+++ b/include/common.php
@@ -138,7 +138,7 @@ function printHeader($withmenu="default") {
 function printFooter() {
 	?>
 	<br />
-	<hr style="width:99%; align:left; color:#99caff;" />
+	<hr style="width:99%; color:#99caff;" />
 	<p style="margin-top: -5px; font-size: 8pt; text-align:center;">PHPki v<?php echo PHPKI_VERSION?> - Copyright 2003 - William E. Roadcap</p>
 	</body>
 	</html>
diff --git a/main.php b/main.php
index 0353ff5..e121c40 100644
--- a/main.php
+++ b/main.php
@@ -22,7 +22,7 @@ case 'display_root':
 	<p>
 	<pre><?php echo  CA_get_root_pem() ?></pre>
 	<p>
-	<form action=<?php echo $PHP_SELF?> method=post>
+	<form action="<?php echo $PHP_SELF?>" method="post">
 		<input type=submit name=submit value="Back to Menu">
 	</form>
 	<?php
diff --git a/search.php b/search.php
index b8c9332..8f63256 100644
--- a/search.php
+++ b/search.php
@@ -49,7 +49,7 @@ case search:
 		?>
 		<center>
 		<h2>Nothing Found</h2>
-		<form action=<?php echo $PHP_SELF?> method=post name=form>
+		<form action="<?php echo $PHP_SELF?>" method="post" name="form">
 		<input type=hidden name=search value="<?php echo htvar($search)?>">
 		<input type=hidden name=show_valid value="<?php echo htvar($show_valid)?>">
 		<input type=hidden name=show_revoked value="<?php echo htvar($show_revoked)?>">
@@ -87,16 +87,16 @@ case search:
 		<td style="white-space: nowrap"><?php echo htvar($rec['issued'])?></td>
 		<td style="white-space: nowrap"><?php echo htvar($rec['expires'])?></td>
 		<td><?php echo htvar($rec[common_name])?></td>
-		<td style="white-space: nowrap"><a href="mailto:<?php echo htvar($rec['common_name']).' <'.htvar($rec['email']).'>"'?>><?php echo htvar($rec['email'])?></a></td>
+		<td style="white-space: nowrap"><a href="mailto: <?php echo htvar($rec['common_name']).'<'.htvar($rec['email']).'>' ?> "> <?php echo htvar($rec['email'])?></a></td>
 		<td><?php echo htvar($rec['organization'])?></td>
 		<td><?php echo htvar($rec['unit'])?></td>
 		<td><?php echo htvar($rec['locality'])?></td>
 		<td><?php echo htvar($rec['province'])?></td>
-		<td><a href=<?php echo $PHP_SELF?>?stage=display&serial=<?php echo htvar($rec['serial'])?> target=_certdisp><img src=images/display.png alt="Display" title="Display the certificate in excruciating detail"></a>
+		<td><a href="<?php echo $PHP_SELF?> ?stage=display&serial=<?php echo htvar($rec['serial'])?>" target=_certdisp><img src=images/display.png alt="Display" title="Display the certificate in excruciating detail"></a>
 		<?php
 		if ($rec['status'] != 'Revoked') {
 			?>
-			<a href=<?php echo $PHP_SELF?>?stage=download&serial=<?php echo htvar($rec['serial'])?>><img src=images/download.png alt="Download" title="Download the certificate so that you may send encrypted e-mail"></a>
+			<a href="<?php echo $PHP_SELF?>?stage=download&serial=<?php echo htvar($rec['serial'])?>"><img src=images/download.png alt="Download" title="Download the certificate so that you may send encrypted e-mail"></a>
 			<?php
 		}
 		print '</td></tr>';
@@ -105,7 +105,7 @@ case search:
 	?>
 	</table>
 
-	<form action=<?php echo $PHP_SELF?> method=post name=form>
+	<form action="<?php echo $PHP_SELF?>" method="post" name="form">
 	<input type=submit name=submit value="Another Search">
 	<input type=hidden name=search value="<?php echo htvar($search)?>">
 	<input type=hidden name=show_valid value="<?php echo htvar($show_valid)?>">
@@ -121,9 +121,9 @@ default:
 	printHeader('public');
 
 	?>
-	<body onLoad="self.focus();document.search.search.focus()">
+	<body onLoad="self.focus();document.search.search.focus();">
 	<center><h2>Certificate Search</h2>
-	<form action=<?php echo $PHP_SELF?> method=post name=search>
+	<form action="<?php echo $PHP_SELF?>" method="post" name="search">
 	<input type=text name=search value="<?php echo htvar($search)?>" maxlength=60 size=40>
 	<input type=submit name=submit value="Find It!"><br>
 	<input type=checkbox name=show_valid value="V" <?php echo ($show_valid?'checked':'')?>>Valid
diff --git a/setup.php-presetup b/setup.php-presetup
index 7bde902..5579820 100644
--- a/setup.php-presetup
+++ b/setup.php-presetup
@@ -705,7 +705,7 @@ E-mail: <a href=mailto:someone@somewhere.com>someone@somewhere.com</a>&nbsp;&nbs
 
 	printHeader('setup');
 	?>
-	<form action=<?php echo $PHP_SELF?> method=post>
+	<form action="<?php echo $PHP_SELF?>" method="post">
 	<center><h2>Certificate Authority Initial Setup</h2></center>
 	<table width=99%>
 	<tr>

Remove User
User ID
			>						?stage=display&serial= target=_certdisp> +	- ?stage=download&serial=> +