diff --git a/html/index.php b/html/index.php
index 8479496f2..7f823d674 100755
--- a/html/index.php
+++ b/html/index.php
@@ -25,7 +25,7 @@ if($debug) {
   $month = time() - (31 * 24 * 60 * 60);
   $year = time() - (365 * 24 * 60 * 60);
 ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml2/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 <head>
   <title><?php echo($config['page_title']); ?></title>
@@ -42,7 +42,7 @@ if($debug) {
 </head>
 <body topmargin="0" leftmargin="0" rightmargin="0" bottommargin="0">
 <script type="text/javascript" src="js/mktree.js"></script>
-<SCRIPT LANGUAGE="JavaScript">
+<script type="text/javascript">
 <!-- Begin
 function popUp(URL) {
   day = new Date();
@@ -74,7 +74,7 @@ function popUp(URL) {
   <table width="100%" style="padding: 0px; margin:0px;">
     <tr>
       <td style="padding: 0px; margin:0px; border: none;">
-        <div id="logo" style="padding: 10px"><a href="index.php"><img src="<?php echo($config['title_image']); ?>" border="0" /></a></div>
+        <div id="logo" style="padding: 10px"><a href="index.php"><img src="<?php echo($config['title_image']); ?>" alt="Logo" border="0" /></a></div>
       </td>
       <td align="center"><?php
         
@@ -106,7 +106,7 @@ function popUp(URL) {
 </div>
 
 
-<?php if($_SESSION['authenticated']) {include("includes/print-menubar.php");} else {echo("<hr colour=#444444 />");} ?>
+<?php if($_SESSION['authenticated']) {include("includes/print-menubar.php");} else {echo('<hr color="#444444" />');} ?>
 
 <div class="clearer"></div>
 
diff --git a/html/pages/logon.inc b/html/pages/logon.inc
index 020d071ec..297278b77 100644
--- a/html/pages/logon.inc
+++ b/html/pages/logon.inc
@@ -1,8 +1,8 @@
 <?php print_optionbar_start(175,420); ?>
     <div style="margin: auto; width:350px; padding:5px;">
-      <table  border="0" cellpadding="0" cellspacing="0">
+      <table border="0" cellpadding="0" cellspacing="0">
         <tr>
-          <td width=128><img src="images/password.png"></td>
+          <td width="128"><img src="images/password.png" alt="Login required" /></td>
           <td>
             <form action="<?php echo $_SERVER['REQUEST_URI'] ?>" method="post" name="logonform">
               <h3>Please log in:</h3>
@@ -10,17 +10,18 @@
               <table border="0" align="left">
                 <tr>
                   <td>Username</td>
-                  <td><input type="text" name="username"></td>
+                  <td><input type="text" name="username" /></td>
                 </tr>
                 <tr>
                   <td>Password</td>
-                  <td><input type="password" name="password"></td>
+                  <td><input type="password" name="password" /></td>
                 </tr>
                 <tr>
-                  <td colspan="2" align="right"><input type="checkbox" name="remember">
-                  <font size="2">Remember Me</td>
+                  <td colspan="2" align="right"><input type="checkbox" name="remember" />
+                  <font size="2">Remember Me</font></td>
+                </tr>
                 <tr>
-                  <td colspan=2 align="right"><input name="submit" type="submit" value="Login"></td>
+                  <td colspan="2" align="right"><input name="submit" type="submit" value="Login" /></td>
                 </tr>
 <?php
 if($auth_message) {
@@ -28,7 +29,8 @@ if($auth_message) {
 }
 ?>
             </table>
-          </form></td>
+            </form>
+          </td>
         </tr>
       </table>
     </div>
