diff --git a/admin/auth.php b/admin/auth.php
index 4393b7123c4..e7d95768ec6 100644
--- a/admin/auth.php
+++ b/admin/auth.php
@@ -95,14 +95,14 @@
     print_header("$site->shortname: $strauthenticationoptions", "$site->fullname",
                   "<a href=\"index.php\">$stradministration</a> -> <a href=\"users.php\">$strusers</a> -> $strauthenticationoptions", "$focus");
 
-    echo "<center><p><b>";
+    echo "<center><b>";
     echo "<form target=\"{$CFG->framename}\" name=\"authmenu\" method=\"post\" action=\"auth.php\">";
     echo "<input type=\"hidden\" name=\"sesskey\" value=\"".$USER->sesskey."\">";
     print_string("chooseauthmethod","auth");
 
     choose_from_menu ($options, "auth", $auth, "","document.location='auth.php?sesskey=$USER->sesskey&auth='+document.authmenu.auth.options[document.authmenu.auth.selectedIndex].value", "");
 
-    echo "</b></p></center>";
+    echo "</b></center>";
         
     print_simple_box_start("center", "100%");
     print_heading($options[$auth]);
@@ -124,9 +124,9 @@
     
     if ($auth != "email" and $auth != "none" and $auth != "manual") {
         echo "<tr valign=\"top\">";
-        echo "<td align=\"right\" nowrap=\"nowrap\"><p>";
+        echo "<td align=\"right\" nowrap=\"nowrap\">";
         print_string("changepassword", "auth");
-        echo ":</p></td>";
+        echo ":</td>";
         echo "<td>";
         echo "<input type=\"text\" name=\"changepassword\" size=\"40\" value=\"$config->changepassword\">";
         echo "</td>";
@@ -137,9 +137,9 @@
     }
 
     echo "<tr valign=\"top\">";
-    echo "<td align=\"right\" nowrap=\"nowrap\"><p>";
+    echo "<td align=\"right\" nowrap=\"nowrap\">";
     print_string("guestloginbutton", "auth");
-    echo ":</p></td>";
+    echo ":</td>";
     echo "<td>";
     choose_from_menu($guestoptions, "guestloginbutton", $config->guestloginbutton, "");
     echo "</td>";
@@ -149,9 +149,9 @@
 
     if (function_exists('auth_user_create')){    
     echo "<tr valign=\"top\">";
-    echo "<td align=\"right\" nowrap=\"nowrap\"><p>";
+    echo "<td align=\"right\" nowrap=\"nowrap\">";
     print_string("auth_user_create", "auth");
-    echo ":</p></td>";
+    echo ":</td>";
     echo "<td>";
     choose_from_menu($createoptions, "auth_user_create", $config->auth_user_create, "");
     echo "</td>";
@@ -160,9 +160,9 @@
     echo "</td></tr>";
     }
 
-    echo "</table><center><p><input type=\"submit\" value=\"";
+    echo "</table><center><input type=\"submit\" value=\"";
     print_string("savechanges");
-    echo "\"></p></center></form>";
+    echo "\"></center></form>";
 
     print_simple_box_end(); 
 
diff --git a/auth/db/config.html b/auth/db/config.html
index e250ae799e5..d2803a60d3f 100644
--- a/auth/db/config.html
+++ b/auth/db/config.html
@@ -28,7 +28,7 @@
     }
 ?>
 <tr valign="top"  bgcolor="<?php echo $THEME->cellheading2 ?>">
-	<td align="right"><p>auth_dbhost:</td>
+	<td align="right">auth_dbhost:</td>
 	<td>
         <input name="auth_dbhost" type="text" size="30" value="<?php echo $config->auth_dbhost?>" />
 	<?php  if (isset($err["auth_dbhost"])) formerr($err["auth_dbhost"]); ?>
@@ -39,7 +39,7 @@
 </tr>
 
 <tr valign="top"  bgcolor="<?php echo $THEME->cellheading2 ?>">
-	<td align="right"><p>auth_dbtype:</td>
+	<td align="right">auth_dbtype:</td>
 	<td>
     <?php  $dbtypes = array("access","ado_access", "ado", "ado_mssql", "borland_ibase", "csv", "db2", "fbsql", "firebird", "ibase", "informix72", "informix", "mssql", "mysql", "mysqlt", "oci805", "oci8", "oci8po", "odbc", "odbc_mssql", "odbc_oracle", "oracle", "postgres64", "postgres7", "postgres", "proxy", "sqlanywhere", "sybase", "vfp");
        foreach ($dbtypes as $dbtype) {
@@ -55,7 +55,7 @@
 </tr>
 
 <tr valign="top"  bgcolor="<?php echo $THEME->cellheading2 ?>">
-	<td align="right"><p>auth_dbname:</td>
+	<td align="right">auth_dbname:</td>
 	<td>
     <input name="auth_dbname" type="text" size="30" value="<?php echo $config->auth_dbname?>" />
     <?php  if (isset($err["auth_dbname"]))formerr($err["auth_dbname"]); ?>
@@ -66,7 +66,7 @@
 </tr>
 
 <tr valign="top"  bgcolor="<?php echo $THEME->cellheading2 ?>">
-	<td align="right"><p>auth_dbuser:</td>
+	<td align="right">auth_dbuser:</td>
 	<td>
     <input name="auth_dbuser" type="text" size="30" value="<?php echo $config->auth_dbuser?>" />
     <?php  if (isset($err["auth_dbuser"])) formerr($err["auth_dbuser"]); ?>
@@ -77,7 +77,7 @@
 </tr>
 
 <tr valign="top"  bgcolor="<?php echo $THEME->cellheading2 ?>">
-	<td align="right"><p>auth_dbpass:</td>
+	<td align="right">auth_dbpass:</td>
 	<td>
     <input name="auth_dbpass" type="text" size="30" value="<?php echo $config->auth_dbpass?>" />
     <?php  if (isset($err["auth_dbpass"])) formerr($err["auth_dbpass"]); ?>
@@ -88,7 +88,7 @@
 </tr>
 
 <tr valign="top"  bgcolor="<?php echo $THEME->cellheading2 ?>">
-	<td align="right"><p>auth_dbtable:</td>
+	<td align="right">auth_dbtable:</td>
 	<td>
     <input name="auth_dbtable" type="text" size="30" value="<?php echo $config->auth_dbtable?>" />
     <?php  if (isset($err["auth_dbtable"])) formerr($err["auth_dbtable"]); ?>
@@ -99,7 +99,7 @@
 </tr>
 
 <tr valign="top"  bgcolor="<?php echo $THEME->cellheading2 ?>">
-	<td align="right"><p>auth_dbfielduser:</td>
+	<td align="right">auth_dbfielduser:</td>
 	<td>
     <input name="auth_dbfielduser" type="text" size="30" value="<?php echo $config->auth_dbfielduser?>" />
     <?php  if (isset($err["auth_dbfielduser"])) formerr($err["auth_dbfielduser"]); ?>
@@ -110,7 +110,7 @@
 </tr>
 
 <tr valign="top"  bgcolor="<?php echo $THEME->cellheading2 ?>">
-	<td align="right"><p>auth_dbfieldpass:</td>
+	<td align="right">auth_dbfieldpass:</td>
 	<td>
     <input name="auth_dbfieldpass" type="text" size="30" value="<?php echo $config->auth_dbfieldpass?>" />
     <?php  if (isset($err["auth_dbfieldpass"])) formerr($err["auth_dbfieldpass"]); ?>
@@ -121,7 +121,7 @@
 </tr>
 
 <tr valign="top"  bgcolor="<?php echo $THEME->cellheading2 ?>">
-	<td align="right"><p>auth_dbpasstype:</td>
+	<td align="right">auth_dbpasstype:</td>
 	<td>
     <?php  $passtype["plaintext"] = get_string("plaintext", "auth");
        $passtype["md5"]       = get_string("md5", "auth");
@@ -136,7 +136,7 @@
 
 
 <tr>
-	<td align="right"><p><?php  print_string("firstname") ?>:</td>
+	<td align="right"><?php  print_string("firstname") ?>:</td>
 	<td>
     <input name="auth_user_firstname" type="text" size="30" value="<?php echo $config->auth_user_firstname?>" />
     </td>
@@ -146,77 +146,77 @@
 </tr>
 
 <tr valign="top">
-	<td align="right"><p><?php  print_string("lastname") ?>:</td>
+	<td align="right"><?php  print_string("lastname") ?>:</td>
 	<td>
     <input name="auth_user_lastname" type="text" size="30" value="<?php echo $config->auth_user_lastname?>" />
     </td>
 </tr>
 
 <tr valign="top">
-	<td align="right"><p><?php  print_string("email") ?>:</td>
+	<td align="right"><?php  print_string("email") ?>:</td>
 	<td>
     <input name="auth_user_email" type="text" size="30" value="<?php echo $config->auth_user_email?>" />
     </td>
 </tr>
 
 <tr valign="top">
-	<td align="right"><p><?php  print_string("phone") ?> 1:</td>
+	<td align="right"><?php  print_string("phone") ?> 1:</td>
 	<td>
     <input name="auth_user_phone1" type="text" size="30" value="<?php echo $config->auth_user_phone1?>" />
     </td>
 </tr>
 
 <tr valign="top">
-	<td align="right"><p><?php  print_string("phone") ?> 2:</td>
+	<td align="right"><?php  print_string("phone") ?> 2:</td>
 	<td>
     <input name="auth_user_phone2" type="text" size="30" value="<?php echo $config->auth_user_phone2?>" />
     </td>
 </tr>
 
 <tr valign="top">
-	<td align="right"><p><?php  print_string("department") ?>:</td>
+	<td align="right"><?php  print_string("department") ?>:</td>
 	<td>
     <input name="auth_user_department" type="text" size="30" value="<?php echo $config->auth_user_department?>" />
     </td>
 </tr>
 
 <tr valign="top">
-	<td align="right"><p><?php  print_string("address") ?>:</td>
+	<td align="right"><?php  print_string("address") ?>:</td>
 	<td>
     <input name="auth_user_address" type="text" size="30" value="<?php echo $config->auth_user_address?>" />
     </td>
 </tr>
 
 <tr valign="top">
-	<td align="right"><p><?php  print_string("city") ?>:</td>
+	<td align="right"><?php  print_string("city") ?>:</td>
 	<td>
     <input name="auth_user_city" type="text" size="30" value="<?php echo $config->auth_user_city?>" />
     </td>
 </tr>
 
 <tr valign="top">
-	<td align="right"><p><?php  print_string("country") ?>:</td>
+	<td align="right"><?php  print_string("country") ?>:</td>
 	<td>
     <input name="auth_user_country" type="text" size="30" value="<?php echo $config->auth_user_country?>" />
     </td>
 </tr>
 
 <tr valign="top">
-	<td align="right"><p><?php  print_string("description") ?>:</td>
+	<td align="right"><?php  print_string("description") ?>:</td>
 	<td>
     <input name="auth_user_description" type="text" size="30" value="<?php echo $config->auth_user_description?>" />
     </td>
 </tr>
 
 <tr valign="top">
-	<td align="right"><p><?php  print_string("idnumber") ?>:</td>
+	<td align="right"><?php  print_string("idnumber") ?>:</td>
 	<td>
     <input name="auth_user_idnumber" type="text" size="30" value="<?php echo $config->auth_user_idnumber?>" />
     </td>
 </tr>
 
 <tr valign="top">
-	<td align="right"><p><?php  print_string("language") ?>:</td>
+	<td align="right"><?php  print_string("language") ?>:</td>
 	<td>
     <input name="auth_user_lang" type="text" size="30" value="<?php echo $config->auth_user_lang?>" />
     </td>
@@ -224,7 +224,7 @@
 
 
 <tr valign="top">
-	<td align="right"><p><?php  print_string("instructions", "auth") ?>:</td>
+	<td align="right"><?php  print_string("instructions", "auth") ?>:</td>
 	<td>
     <textarea name="auth_instructions" cols="30" rows="10" wrap="virtual"><?php  p($config->auth_instructions) ?></textarea> 
     </td>
diff --git a/auth/fc/config.html b/auth/fc/config.html
index e321ea5988c..3ba334f14c8 100644
--- a/auth/fc/config.html
+++ b/auth/fc/config.html
@@ -36,7 +36,7 @@
 
 <tr valign="top" bgcolor="<?php echo $THEME->cellheading2 ?>">
 
-	<td align="right"><p>auth_fchost:</td>
+	<td align="right">auth_fchost:</td>
 
 	<td>
 
@@ -58,7 +58,7 @@
 
 <tr valign="top" bgcolor="<?php echo $THEME->cellheading2 ?>">
 
-	<td align="right"><p>auth_fcfppport:</td>
+	<td align="right">auth_fcfppport:</td>
 
 	<td>
 
@@ -80,7 +80,7 @@
 
 <tr valign="top" bgcolor="<?php echo $THEME->cellheading2 ?>">
 
-	<td align="right"><p>auth_fcuserid:</td>
+	<td align="right">auth_fcuserid:</td>
 
 	<td>
 
@@ -102,7 +102,7 @@
 
 <tr valign="top" bgcolor="<?php echo $THEME->cellheading2 ?>">
 
-	<td align="right"><p>auth_fcpasswd:</td>
+	<td align="right">auth_fcpasswd:</td>
 
 	<td>
 
@@ -124,7 +124,7 @@
 
 <tr valign="top" bgcolor="<?php echo $THEME->cellheading2 ?>">
 
-	<td align="right"><p>auth_fccreators:</td>
+	<td align="right">auth_fccreators:</td>
 
 	<td>
 
@@ -148,7 +148,7 @@
 
 <tr valign="top">
 
-	<td align="right"><p><?php  print_string("instructions", "auth") ?>:</td>
+	<td align="right"><?php  print_string("instructions", "auth") ?>:</td>
 
 	<td>
 
diff --git a/auth/imap/config.html b/auth/imap/config.html
index 5b385a8a5a6..68501fae839 100644
--- a/auth/imap/config.html
+++ b/auth/imap/config.html
@@ -10,7 +10,7 @@
     }
 ?>
 <tr valign="top" bgcolor="<?php echo $THEME->cellheading2 ?>">
-	<td align="right"><p>auth_imaphost:</td>
+	<td align="right">auth_imaphost:</td>
 	<td>
         <input name="auth_imaphost" type="text" size="30" value="<?php echo $config->auth_imaphost?>" />
 	<?php  if (isset($err["auth_imaphost"])) formerr($err["auth_imaphost"]); ?>
@@ -22,7 +22,7 @@
 </tr>
 
 <tr valign="top" bgcolor="<?php echo $THEME->cellheading2 ?>">
-	<td align="right"><p>auth_imaptype:</td>
+	<td align="right">auth_imaptype:</td>
 	<td>
     <?php  $imaptypes = array("imap","imapssl", "imapcert", "imaptls");
        foreach($imaptypes as $imaptype) {
@@ -37,7 +37,7 @@
 </tr>
 
 <tr valign="top" bgcolor="<?php echo $THEME->cellheading2 ?>">
-	<td align="right"><p>auth_imapport:</td>
+	<td align="right">auth_imapport:</td>
 	<td>
     <input name="auth_imapport" type="text" size="6" value="<?php echo $config->auth_imapport?>" />
     <?php  if (isset($err["auth_imapport"])) formerr($err["auth_imapport"]); ?>
@@ -48,7 +48,7 @@
 </tr>
 
 <tr valign="top">
-	<td align="right"><p><?php  print_string("instructions", "auth") ?>:</td>
+	<td align="right"><?php  print_string("instructions", "auth") ?>:</td>
 	<td>
     <textarea name="auth_instructions" cols="30" rows="10" wrap="virtual"><?php  p($config->auth_instructions) ?></textarea> 
     </td>
diff --git a/auth/manual/config.html b/auth/manual/config.html
index 25c4b30e256..2febb35297c 100644
--- a/auth/manual/config.html
+++ b/auth/manual/config.html
@@ -1,5 +1,5 @@
 <tr valign="top">
-	<td align="right"><p><?php  print_string("instructions", "auth") ?>:</td>
+	<td align="right"><?php  print_string("instructions", "auth") ?>:</td>
 	<td>
     <textarea name="auth_instructions" cols="30" rows="10" wrap="virtual"><?php  p($config->auth_instructions) ?></textarea> 
     </td>
diff --git a/auth/nntp/config.html b/auth/nntp/config.html
index e5fbd4a05fc..fb278adcbd4 100644
--- a/auth/nntp/config.html
+++ b/auth/nntp/config.html
@@ -8,7 +8,7 @@
 ?>
 
 <tr valign="top" bgcolor="<?php echo $THEME->cellheading2 ?>">
-	<td align="right"><p>auth_nntphost:</td>
+	<td align="right">auth_nntphost:</td>
 	<td>
         <input name="auth_nntphost" type="text" size="30" value="<?php echo $config->auth_nntphost?>" />
 	<?php  if (isset($err["auth_nntphost"]))  formerr($err["auth_nntphost"]); ?>
@@ -20,7 +20,7 @@
 </tr>
 
 <tr valign="top" bgcolor="<?php echo $THEME->cellheading2 ?>">
-	<td align="right"><p>auth_nntpport:</td>
+	<td align="right">auth_nntpport:</td>
 	<td>
     <input name="auth_nntpport" type="text" size="6" value="<?php echo $config->auth_nntpport?>" />
     <?php  if (isset($err["auth_nntpport"])) formerr($err["auth_nntpport"]); ?>
@@ -31,7 +31,7 @@
 </tr>
 
 <tr valign="top">
-	<td align="right"><p><?php  print_string("instructions", "auth") ?>:</td>
+	<td align="right"><?php  print_string("instructions", "auth") ?>:</td>
 	<td>
     <textarea name="auth_instructions" cols="30" rows="10" wrap="virtual"><?php  p($config->auth_instructions) ?></textarea> 
     </td>
diff --git a/auth/pop3/config.html b/auth/pop3/config.html
index 114f1e077d5..5f74a2accf7 100644
--- a/auth/pop3/config.html
+++ b/auth/pop3/config.html
@@ -13,7 +13,7 @@
     }
 ?>
 <tr valign="top" bgcolor="<?php echo $THEME->cellheading2 ?>">
-	<td align="right"><p>auth_pop3host:</td>
+	<td align="right">auth_pop3host:</td>
 	<td>
         <input name="auth_pop3host" type="text" size="30" value="<?php echo $config->auth_pop3host?>" />
 	<?php  if (isset($err["auth_pop3host"])) formerr($err["auth_pop3host"]); ?>
@@ -25,7 +25,7 @@
 </tr>
 
 <tr valign="top" bgcolor="<?php echo $THEME->cellheading2 ?>">
-	<td align="right"><p>auth_pop3type:</td>
+	<td align="right">auth_pop3type:</td>
 	<td>
     <?php  $pop3types = array("pop3","pop3cert", "pop3notls");
        foreach($pop3types as $pop3type) {
@@ -40,7 +40,7 @@
 </tr>
 
 <tr valign="top" bgcolor="<?php echo $THEME->cellheading2 ?>">
-	<td align="right"><p>auth_pop3port:</td>
+	<td align="right">auth_pop3port:</td>
 	<td>
     <input name="auth_pop3port" type="text" size="6" value="<?php echo $config->auth_pop3port?>" />
     <?php  if (isset($err["auth_pop3port"])) formerr($err["auth_pop3port"]); ?>
@@ -51,7 +51,7 @@
 </tr>
 
 <tr valign="top" bgcolor="<?php echo $THEME->cellheading2 ?>">
-	<td align="right"><p>auth_pop3mailbox:</td>
+	<td align="right">auth_pop3mailbox:</td>
 	<td>
     <input name="auth_pop3mailbox" type="text" size="6" value="<?php echo $config->auth_pop3mailbox?>" />
     <?php  if (isset($err["auth_pop3mailbox"])) formerr($err["auth_pop3mailbox"]); ?>
@@ -62,7 +62,7 @@
 </tr>
 
 <tr valign="top">
-	<td align="right"><p><?php  print_string("instructions", "auth") ?>:</td>
+	<td align="right"><?php  print_string("instructions", "auth") ?>:</td>
 	<td>
     <textarea name="auth_instructions" cols="30" rows="10" wrap="virtual"><?php  p($config->auth_instructions) ?></textarea> 
     </td>
diff --git a/auth/shibboleth/config.html b/auth/shibboleth/config.html
index 7292a57e09d..79d05d41fef 100755
--- a/auth/shibboleth/config.html
+++ b/auth/shibboleth/config.html
@@ -1,133 +1,131 @@
-<?PHP
-?>
 <tr valign="top">
-    <TD ALIGN=RIGHT><P>Shibboleth WAYF url:</TD>
-    <TD>
-        <INPUT name=shib_wayf_url TYPE=text SIZE=30 VALUE="<?php echo $config->shib_wayf_url?>">
+    <td align="right">Shibboleth WAYF URL:</td>
+    <td>
+        <input name=shib_wayf_url type=text size=30 value="<?php echo $config->shib_wayf_url?>">
     <?php  if (isset($err["shib_wayf_url"])) formerr($err["shib_wayf_url"]); ?>
-    </TD>
-    <TD>
-    </TD>
-</TR>
-<TR>
-    <TD ALIGN=RIGHT><P>Shibboleth logout url:</TD>
-    <TD>
-    <INPUT name="shib_logout_url" TYPE="text" SIZE="30" VALUE="<?php echo $config->shib_logout_url?>">
-    </TD>
-    <TD rowspan=12 VALIGN=CENTER>                                                                                                                                 </TD>
-</TR>  
-<TR>
-    <TD ALIGN=RIGHT><P><?php  print_string("username") ?>:</TD>
-    <TD>
-    <INPUT name="shib_user_attribute" TYPE="text" SIZE="30" VALUE="<?php echo $config->shib_user_attribute?>">
-    </TD>
-    <TD rowspan=12 VALIGN=CENTER>
-    </TD>
-</TR>
+    </td>
+    <td>
+    </td>
+</tr>
+<tr>
+    <td align="right">Shibboleth logout URL:</td>
+    <td>
+    <input name="shib_logout_url" type="text" size="30" value="<?php echo $config->shib_logout_url?>">
+    </td>
+    <td rowspan=12 valign=center>                                                                                                                                 </td>
+</tr>  
+<tr>
+    <td align="right"><?php  print_string("username") ?>:</td>
+    <td>
+    <input name="shib_user_attribute" type="text" size="30" value="<?php echo $config->shib_user_attribute?>">
+    </td>
+    <td rowspan=12 valign=center>
+    </td>
+</tr>
 
-<TR>
-    <TD ALIGN=RIGHT><P><?php  print_string("firstname") ?>:</TD>
-    <TD>
-    <INPUT name="auth_user_firstname" TYPE="text" SIZE="30" VALUE="<?php echo $config->auth_user_firstname?>">
-    </TD>
-    <TD rowspan=12 VALIGN=CENTER>
-    </TD>
-</TR>
-<TR VALIGN=TOP>
-    <TD ALIGN=RIGHT><P><?php  print_string("lastname") ?>:</TD>
-    <TD>
-    <INPUT name="auth_user_lastname" TYPE="text" SIZE="30" VALUE="<?php echo $config->auth_user_lastname?>">
-    </TD>
-</TR>
+<tr>
+    <td align="right"><?php  print_string("firstname") ?>:</td>
+    <td>
+    <input name="auth_user_firstname" type="text" size="30" value="<?php echo $config->auth_user_firstname?>">
+    </td>
+    <td rowspan=12 valign=center>
+    </td>
+</tr>
+<tr valign="top">
+    <td align="right"><?php  print_string("lastname") ?>:</td>
+    <td>
+    <input name="auth_user_lastname" type="text" size="30" value="<?php echo $config->auth_user_lastname?>">
+    </td>
+</tr>
 
-<TR VALIGN=TOP>
-    <TD ALIGN=RIGHT><P><?php  print_string("email") ?>:</TD>
-    <TD>
-    <INPUT name="auth_user_email" TYPE="text" SIZE="30" VALUE="<?php echo $config->auth_user_email?>">
-    </TD>
-</TR>
+<tr valign="top">
+    <td align="right"><?php  print_string("email") ?>:</td>
+    <td>
+    <input name="auth_user_email" type="text" size="30" value="<?php echo $config->auth_user_email?>">
+    </td>
+</tr>
 
-<TR VALIGN=TOP>
-    <TD ALIGN=RIGHT><P><?php  print_string("phone") ?> 1:</TD>
-    <TD>
-    <INPUT name="auth_user_phone1" TYPE="text" SIZE="30" VALUE="<?php echo $config->auth_user_phone1?>">
-    </TD>
-</TR>
+<tr valign="top">
+    <td align="right"><?php  print_string("phone") ?> 1:</td>
+    <td>
+    <input name="auth_user_phone1" type="text" size="30" value="<?php echo $config->auth_user_phone1?>">
+    </td>
+</tr>
 
-<TR VALIGN=TOP>
-    <TD ALIGN=RIGHT><P><?php  print_string("phone") ?> 2:</TD>
-    <TD>
-    <INPUT name="auth_user_phone2" TYPE="text" SIZE="30" VALUE="<?php echo $config->auth_user_phone2?>">
-    </TD>
-</TR>
+<tr valign="top">
+    <td align="right"><?php  print_string("phone") ?> 2:</td>
+    <td>
+    <input name="auth_user_phone2" type="text" size="30" value="<?php echo $config->auth_user_phone2?>">
+    </td>
+</tr>
 
-<TR VALIGN=TOP>
-    <TD ALIGN=RIGHT><P><?php  print_string("department") ?>:</TD>
-    <TD>
-    <INPUT name="auth_user_department" TYPE="text" SIZE="30" VALUE="<?php echo $config->auth_user_department?>">
-    </TD>
-</TR>
+<tr valign="top">
+    <td align="right"><?php  print_string("department") ?>:</td>
+    <td>
+    <input name="auth_user_department" type="text" size="30" value="<?php echo $config->auth_user_department?>">
+    </td>
+</tr>
 
-<TR VALIGN=TOP>
-    <TD ALIGN=RIGHT><P><?php  print_string("address") ?>:</TD>
-    <TD>
-    <INPUT name="auth_user_address" TYPE="text" SIZE="30" VALUE="<?php echo $config->auth_user_address?>">
-    </TD>
-</TR>
+<tr valign="top">
+    <td align="right"><?php  print_string("address") ?>:</td>
+    <td>
+    <input name="auth_user_address" type="text" size="30" value="<?php echo $config->auth_user_address?>">
+    </td>
+</tr>
 
-<TR VALIGN=TOP>
-    <TD ALIGN=RIGHT><P><?php  print_string("city") ?>:</TD>
-    <TD>
-    <INPUT name="auth_user_city" TYPE="text" SIZE="30" VALUE="<?php echo $config->auth_user_city?>">
-    </TD>
-</TR>
+<tr valign="top">
+    <td align="right"><?php  print_string("city") ?>:</td>
+    <td>
+    <input name="auth_user_city" type="text" size="30" value="<?php echo $config->auth_user_city?>">
+    </td>
+</tr>
 
-<TR VALIGN=TOP>
-    <TD ALIGN=RIGHT><P><?php  print_string("country") ?>:</TD>
-    <TD>
-    <INPUT name="auth_user_country" TYPE="text" SIZE="30" VALUE="<?php echo $config->auth_user_country?>">
-    </TD>
-</TR>
+<tr valign="top">
+    <td align="right"><?php  print_string("country") ?>:</td>
+    <td>
+    <input name="auth_user_country" type="text" size="30" value="<?php echo $config->auth_user_country?>">
+    </td>
+</tr>
 
-<TR VALIGN=TOP>
-    <TD ALIGN=RIGHT><P><?php  print_string("description") ?>:</TD>
-    <TD>
-    <INPUT name="auth_user_description" TYPE="text" SIZE="30" VALUE="<?php echo $config->auth_user_description?>">
-    </TD>
-</TR>
+<tr valign="top">
+    <td align="right"><?php  print_string("description") ?>:</td>
+    <td>
+    <input name="auth_user_description" type="text" size="30" value="<?php echo $config->auth_user_description?>">
+    </td>
+</tr>
 
-<TR VALIGN=TOP>
-    <TD ALIGN=RIGHT><P><?php  print_string("idnumber") ?>:</TD>
-    <TD>
-    <INPUT name="auth_user_idnumber" TYPE="text" SIZE="30" VALUE="<?php echo $config->auth_user_idnumber?>">
-    </TD>
-</TR>
+<tr valign="top">
+    <td align="right"><?php  print_string("idnumber") ?>:</td>
+    <td>
+    <input name="auth_user_idnumber" type="text" size="30" value="<?php echo $config->auth_user_idnumber?>">
+    </td>
+</tr>
 
-<TR VALIGN=TOP>
-    <TD ALIGN=RIGHT><P><?php  print_string("language") ?>:</TD>
-    <TD>
-    <INPUT name="auth_user_lang" TYPE="text" SIZE="30" VALUE="<?php echo $config->auth_user_lang?>">
-    </TD>
-</TR>
+<tr valign="top">
+    <td align="right"><?php  print_string("language") ?>:</td>
+    <td>
+    <input name="auth_user_lang" type="text" size="30" value="<?php echo $config->auth_user_lang?>">
+    </td>
+</tr>
 
-<TR VALIGN=TOP>
-    <TD ALIGN=RIGHT><P><?php  print_string("guid") ?>:</TD>
-    <TD>
-    <INPUT name="auth_user_guid" TYPE="text" SIZE="30" VALUE="<?php echo $config->auth_user_guid?>">
-    </TD>
-</TR>
+<tr valign="top">
+    <td align="right"><?php  print_string("guid") ?>:</td>
+    <td>
+    <input name="auth_user_guid" type="text" size="30" value="<?php echo $config->auth_user_guid?>">
+    </td>
+</tr>
 
 
-<TR VALIGN=TOP>
-    <TD ALIGN=RIGHT><P><?php  print_string("instructions", "auth") ?>:</TD>
-    <TD>
-    <TEXTAREA NAME=auth_instructions COLS=30 ROWS=10 WRAP=virtual><?php  p($config->auth_instructions) ?></TEXTAREA> 
-    </TD>
-    <TD>
+<tr valign="top">
+    <td align="right"><?php  print_string("instructions", "auth") ?>:</td>
+    <td>
+    <textarea name="auth_instructions" cols="30" rows="10" wrap="virtual"><?php  p($config->auth_instructions) ?></textarea> 
+    </td>
+    <td>
     <?php  print_string("authinstructions","auth") ?>
     <?php  helpbutton("text", get_string("helptext")) ?>
-    </TD>
-</TR>
+    </td>
+</tr>