diff --git a/auth/db/config.html b/auth/db/config.html
index d2803a60d3f..b89ce55664d 100644
--- a/auth/db/config.html
+++ b/auth/db/config.html
@@ -27,7 +27,7 @@
         $config->auth_dbpasstype = "plaintext";
     }
 ?>
-<tr valign="top"  bgcolor="<?php echo $THEME->cellheading2 ?>">
+<tr valign="top" class="required">
 	<td align="right">auth_dbhost:</td>
 	<td>
         <input name="auth_dbhost" type="text" size="30" value="<?php echo $config->auth_dbhost?>" />
@@ -38,7 +38,7 @@
     </td>
 </tr>
 
-<tr valign="top"  bgcolor="<?php echo $THEME->cellheading2 ?>">
+<tr valign="top" class="required">
 	<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");
@@ -54,7 +54,7 @@
     </td>
 </tr>
 
-<tr valign="top"  bgcolor="<?php echo $THEME->cellheading2 ?>">
+<tr valign="top" class="required">
 	<td align="right">auth_dbname:</td>
 	<td>
     <input name="auth_dbname" type="text" size="30" value="<?php echo $config->auth_dbname?>" />
@@ -65,7 +65,7 @@
     </td>
 </tr>
 
-<tr valign="top"  bgcolor="<?php echo $THEME->cellheading2 ?>">
+<tr valign="top" class="required">
 	<td align="right">auth_dbuser:</td>
 	<td>
     <input name="auth_dbuser" type="text" size="30" value="<?php echo $config->auth_dbuser?>" />
@@ -76,7 +76,7 @@
     </td>
 </tr>
 
-<tr valign="top"  bgcolor="<?php echo $THEME->cellheading2 ?>">
+<tr valign="top" class="required">
 	<td align="right">auth_dbpass:</td>
 	<td>
     <input name="auth_dbpass" type="text" size="30" value="<?php echo $config->auth_dbpass?>" />
@@ -87,7 +87,7 @@
     </td>
 </tr>
 
-<tr valign="top"  bgcolor="<?php echo $THEME->cellheading2 ?>">
+<tr valign="top" class="required">
 	<td align="right">auth_dbtable:</td>
 	<td>
     <input name="auth_dbtable" type="text" size="30" value="<?php echo $config->auth_dbtable?>" />
@@ -98,7 +98,7 @@
     </td>
 </tr>
 
-<tr valign="top"  bgcolor="<?php echo $THEME->cellheading2 ?>">
+<tr valign="top" class="required">
 	<td align="right">auth_dbfielduser:</td>
 	<td>
     <input name="auth_dbfielduser" type="text" size="30" value="<?php echo $config->auth_dbfielduser?>" />
@@ -109,7 +109,7 @@
     </td>
 </tr>
 
-<tr valign="top"  bgcolor="<?php echo $THEME->cellheading2 ?>">
+<tr valign="top" class="required">
 	<td align="right">auth_dbfieldpass:</td>
 	<td>
     <input name="auth_dbfieldpass" type="text" size="30" value="<?php echo $config->auth_dbfieldpass?>" />
@@ -120,10 +120,11 @@
     </td>
 </tr>
 
-<tr valign="top"  bgcolor="<?php echo $THEME->cellheading2 ?>">
+<tr valign="top" class="required">
 	<td align="right">auth_dbpasstype:</td>
 	<td>
-    <?php  $passtype["plaintext"] = get_string("plaintext", "auth");
+    <?php  
+       $passtype["plaintext"] = get_string("plaintext", "auth");
        $passtype["md5"]       = get_string("md5", "auth");
        choose_from_menu($passtype, "auth_dbpasstype", $config->auth_dbpasstype, "");
     ?>
diff --git a/auth/email/config.html b/auth/email/config.html
index ad9ab1e7ca3..660e38b7020 100644
--- a/auth/email/config.html
+++ b/auth/email/config.html
@@ -1 +1,2 @@
 <!-- No config needed -->
+<div align="center"><?php print_string('none'); ?></div>
diff --git a/auth/fc/config.html b/auth/fc/config.html
index 3ba334f14c8..90e7e9f11be 100644
--- a/auth/fc/config.html
+++ b/auth/fc/config.html
@@ -34,7 +34,7 @@
 
 
 
-<tr valign="top" bgcolor="<?php echo $THEME->cellheading2 ?>">
+<tr valign="top" class="required">
 
 	<td align="right">auth_fchost:</td>
 
@@ -56,7 +56,7 @@
 
 
 
-<tr valign="top" bgcolor="<?php echo $THEME->cellheading2 ?>">
+<tr valign="top" class="required">
 
 	<td align="right">auth_fcfppport:</td>
 
@@ -78,7 +78,7 @@
 
 
 
-<tr valign="top" bgcolor="<?php echo $THEME->cellheading2 ?>">
+<tr valign="top" class="required">
 
 	<td align="right">auth_fcuserid:</td>
 
@@ -100,7 +100,7 @@
 
 
 
-<tr valign="top" bgcolor="<?php echo $THEME->cellheading2 ?>">
+<tr valign="top" class="required">
 
 	<td align="right">auth_fcpasswd:</td>
 
@@ -122,7 +122,7 @@
 
 
 
-<tr valign="top" bgcolor="<?php echo $THEME->cellheading2 ?>">
+<tr valign="top" class="required">
 
 	<td align="right">auth_fccreators:</td>
 
diff --git a/auth/imap/config.html b/auth/imap/config.html
index 68501fae839..9e7389fce8f 100644
--- a/auth/imap/config.html
+++ b/auth/imap/config.html
@@ -9,7 +9,7 @@
         $config->auth_imapport = "143";
     }
 ?>
-<tr valign="top" bgcolor="<?php echo $THEME->cellheading2 ?>">
+<tr valign="top" class="required">
 	<td align="right">auth_imaphost:</td>
 	<td>
         <input name="auth_imaphost" type="text" size="30" value="<?php echo $config->auth_imaphost?>" />
@@ -21,7 +21,7 @@
     </td>
 </tr>
 
-<tr valign="top" bgcolor="<?php echo $THEME->cellheading2 ?>">
+<tr valign="top" class="required">
 	<td align="right">auth_imaptype:</td>
 	<td>
     <?php  $imaptypes = array("imap","imapssl", "imapcert", "imaptls");
@@ -36,7 +36,7 @@
     </td>
 </tr>
 
-<tr valign="top" bgcolor="<?php echo $THEME->cellheading2 ?>">
+<tr valign="top" class="required">
 	<td align="right">auth_imapport:</td>
 	<td>
     <input name="auth_imapport" type="text" size="6" value="<?php echo $config->auth_imapport?>" />
diff --git a/auth/ldap/config.html b/auth/ldap/config.html
index f45a650e348..579dbf257c4 100644
--- a/auth/ldap/config.html
+++ b/auth/ldap/config.html
@@ -74,8 +74,8 @@ if (!function_exists('ldap_connect')){ // Is php4-ldap really there?
    </td>
 </tr>
 
-<tr valign="top" bgcolor="<?php echo $THEME->cellheading2 ?>">
-    <td align="right"><P>ldap_host_url:</td>
+<tr valign="top" class="required">
+    <td align="right">ldap_host_url:</td>
     <td>
         <input name="ldap_host_url" type="text" size="30" value="<?php echo $config->ldap_host_url?>">
     <?php  if (isset($err["ldap_host_url"])) formerr($err["ldap_host_url"]); ?>
@@ -85,8 +85,8 @@ if (!function_exists('ldap_connect')){ // Is php4-ldap really there?
     </td>
 </tr>
 
-<tr valign="top" bgcolor="<?php echo $THEME->cellheading2 ?>">
-    <td align="right"><P>ldap_version:</td>
+<tr valign="top" class="required">
+    <td align="right">ldap_version:</td>
     <td>
     <?php
        $versions[2] = "2";
@@ -106,8 +106,8 @@ if (!function_exists('ldap_connect')){ // Is php4-ldap really there?
    </td>
 </tr>
 
-<tr valign="top" bgcolor="<?php echo $THEME->cellheading2 ?>">
-    <td align="right"><P>ldap_bind_dn:</td>
+<tr valign="top" class="required">
+    <td align="right">ldap_bind_dn:</td>
     <td>
     <input name="ldap_bind_dn" type="text" size="30" value="<?php echo $config->ldap_bind_dn?>">
     <?php  if (isset($err["ldap_bind_dn"])) formerr($err["ldap_bind_dn"]); ?>
@@ -116,8 +116,8 @@ if (!function_exists('ldap_connect')){ // Is php4-ldap really there?
     </td>
 </tr>
 
-<tr valign="top" bgcolor="<?php echo $THEME->cellheading2 ?>">
-    <td align="right"><P>ldap_bind_pw:</td>
+<tr valign="top" class="required">
+    <td align="right">ldap_bind_pw:</td>
     <td>
     <input name="ldap_bind_pw" type="password" size="30" value="<?php echo $config->ldap_bind_pw?>">
     <?php  if (isset($err["ldap_bind_pw"])) formerr($err["ldap_bind_pw"]); ?>
@@ -132,8 +132,8 @@ if (!function_exists('ldap_connect')){ // Is php4-ldap really there?
    </td>
 </tr>
 
-<tr valign="top" bgcolor="<?php echo $THEME->cellheading2 ?>">
-    <td align="right"><P>ldap_user_type:</td>
+<tr valign="top" class="required">
+    <td align="right">ldap_user_type:</td>
     <td>
     <?php choose_from_menu(auth_ldap_suppported_usertypes(), "ldap_user_type", $config->ldap_user_type, ""); ?>
     <?php  if (isset($err["ldap_user_type"])) formerr($err["ldap_user_type"]); ?>
@@ -143,8 +143,8 @@ if (!function_exists('ldap_connect')){ // Is php4-ldap really there?
     </td>
 </tr>
 
-<tr valign="top" bgcolor="<?php echo $THEME->cellheading2 ?>">
-    <td align="right"><P>ldap_contexts:</td>
+<tr valign="top" class="required">
+    <td align="right">ldap_contexts:</td>
     <td>
     <input name="ldap_contexts" type="text" size="30" value="<?php echo $config->ldap_contexts?>">
     <?php  if (isset($err["ldap_contexts"])) formerr($err["ldap_contexts"]); ?>
@@ -154,8 +154,8 @@ if (!function_exists('ldap_connect')){ // Is php4-ldap really there?
     </td>
 </tr>
 
-<tr valign="top" bgcolor="<?php echo $THEME->cellheading2 ?>">
-    <td align="right"><P>ldap_search_sub:</td>
+<tr valign="top" class="required">
+    <td align="right">ldap_search_sub:</td>
     <td>
     <input name="ldap_search_sub" type="text" size="1" value="<?php echo $config->ldap_search_sub?>">
     <?php  if (isset($err["ldap_search_sub"])) formerr($err["ldap_search_sub"]); ?>
@@ -164,8 +164,8 @@ if (!function_exists('ldap_connect')){ // Is php4-ldap really there?
     <?php  print_string("auth_ldap_search_sub","auth") ?>
     </td>
 </tr>
-<tr valign="top" bgcolor="<?php echo $THEME->cellheading2 ?>">
-    <td align="right"><P>ldap_opt_deref:</td>
+<tr valign="top" class="required">
+    <td align="right">ldap_opt_deref:</td>
     <td>
     <?php
        $opt_deref[LDAP_DEREF_NEVER] = get_string("no");
@@ -181,8 +181,8 @@ if (!function_exists('ldap_connect')){ // Is php4-ldap really there?
 
 
 
-<tr valign="top" bgcolor="<?php echo $THEME->cellheading2 ?>">
-    <td align="right"><P>ldap_user_attribute:</td>
+<tr valign="top" class="required">
+    <td align="right">ldap_user_attribute:</td>
     <td>
     <input name="ldap_user_attribute" type="text" size="30" value="<?php echo $config->ldap_user_attribute?>">
     <?php  if (isset($err["ldap_user_attribute"])) formerr($err["ldap_user_attribute"]); ?>
@@ -192,8 +192,8 @@ if (!function_exists('ldap_connect')){ // Is php4-ldap really there?
     </td>
 </tr>
 
-<tr valign="top" bgcolor="<?php echo $THEME->cellheading2 ?>">
-        <td align="right"><P>ldap_memberattribute:</td>
+<tr valign="top" class="required">
+        <td align="right">ldap_memberattribute:</td>
         <td>
     <input name="ldap_memberattribute" type="text" size="30" value="<?php echo $config->ldap_memberattribute?>">
     <?php  if (isset($err["ldap_memberattribute"])) formerr($err["ldap_memberattribute"]); ?>
@@ -202,8 +202,8 @@ if (!function_exists('ldap_connect')){ // Is php4-ldap really there?
     </td>
 </tr>
 
-<tr valign="top" bgcolor="<?php echo $THEME->cellheading2 ?>">
-    <td align="right"><P>ldap_objectclass:</td>
+<tr valign="top" class="required">
+    <td align="right">ldap_objectclass:</td>
     <td>
     <input name="ldap_objectclass" type="text" size="30" value="<?php echo $config->ldap_objectclass?>">
     <?php  if (isset($err["ldap_objectclass"])) formerr($err["ldap_objectclass"]); ?>
@@ -219,8 +219,8 @@ if (!function_exists('ldap_connect')){ // Is php4-ldap really there?
    </td>
 </tr>
 
-<tr valign="top" bgcolor="<?php echo $THEME->cellheading2 ?>" >
-    <td align="right" valign="top"><P><?php  print_string('forcechangepassword', 'auth') ?>:</P></td>
+<tr valign="top" class="required">
+    <td align="right" valign="top"><?php  print_string('forcechangepassword', 'auth') ?>:</td>
     <td>
  
     <select name="auth_ldap_forcechangepassword">
@@ -232,12 +232,12 @@ if (!function_exists('ldap_connect')){ // Is php4-ldap really there?
  
     </td>
     <td align="left" valign="top">
-        <P><?php  print_string('forcechangepasswordfirst_help', 'auth') ?></P>
+        <p><?php  print_string('forcechangepasswordfirst_help', 'auth') ?></p>
     </td>
 </tr>
 
-<tr valign="top"  bgcolor="<?php echo $THEME->cellheading2 ?>" >
-    <td align="right" valign="top"><P><?php  print_string('stdchangepassword', 'auth') ?>:</P></td>
+<tr valign="top"  class="required">
+    <td align="right" valign="top"><?php  print_string('stdchangepassword', 'auth') ?>:</td>
     <td>
  
     <select name="auth_ldap_stdchangepassword">
@@ -249,8 +249,8 @@ if (!function_exists('ldap_connect')){ // Is php4-ldap really there?
 
     </td>
     <td align="left" valign="top">
-        <P><?php  print_string('stdchangepassword_expl', 'auth') ?></P>
-        <P><?php  print_string('stdchangepassword_explldap', 'auth') ?></P>
+        <p><?php  print_string('stdchangepassword_expl', 'auth') ?></p>
+        <p><?php  print_string('stdchangepassword_explldap', 'auth') ?></p>
     </td>
 </tr>
 
@@ -260,8 +260,8 @@ if (!function_exists('ldap_connect')){ // Is php4-ldap really there?
    </td>
 </tr>
 
-<tr valign="top" bgcolor="<?php echo $THEME->cellheading2 ?>">
-    <td align="right"><P>ldap_expiration:</td>
+<tr valign="top" class="required">
+    <td align="right">ldap_expiration:</td>
     <td>
     <?php
        $expiration['0'] = "No";
@@ -276,8 +276,8 @@ if (!function_exists('ldap_connect')){ // Is php4-ldap really there?
 </tr>
 
 
-<tr valign="top" bgcolor="<?php echo $THEME->cellheading2 ?>">
-    <td align="right"><P>ldap_expiration_warning:</td>
+<tr valign="top" class="required">
+    <td align="right">ldap_expiration_warning:</td>
     <td>
     <input name="ldap_expiration_warning" type="text" size="2" value="<?php echo $config->ldap_expiration_warning?>">
     <?php   if (isset($err["ldap_expiration_warning"])) formerr($err["ldap_expiration_warning"]); 
@@ -288,8 +288,8 @@ if (!function_exists('ldap_connect')){ // Is php4-ldap really there?
     </td>
 </tr>
 
-<tr valign="top" bgcolor="<?php echo $THEME->cellheading2 ?>">
-    <td align="right"><P>ldap_exprireattr:</td>
+<tr valign="top" class="required">
+    <td align="right">ldap_exprireattr:</td>
     <td>
     <input name="ldap_expireattr" type="text" size="30" value="<?php echo $config->ldap_expireattr?>">
     <?php  if (isset($err["ldap_expireattr"])) formerr($err["ldap_expireattr"]); 
@@ -300,8 +300,8 @@ if (!function_exists('ldap_connect')){ // Is php4-ldap really there?
     </td>
 </tr>
 
-<tr valign="top" bgcolor="<?php echo $THEME->cellheading2 ?>">
-    <td align="right"><P>ldap_gracelogins:</td>
+<tr valign="top" class="required">
+    <td align="right">ldap_gracelogins:</td>
     <td>
     <?php
        $grace['0'] = get_string("no");
@@ -315,8 +315,8 @@ if (!function_exists('ldap_connect')){ // Is php4-ldap really there?
     </td>
 </tr>
 
-<tr valign="top" bgcolor="<?php echo $THEME->cellheading2 ?>">
-    <td align="right"><P>ldap_graceattr:</td>
+<tr valign="top" class="required">
+    <td align="right">ldap_graceattr:</td>
     <td>
     <input name="ldap_graceattr" type="text" size="30" value="<?php echo $config->ldap_graceattr?>">
     <?php   if (isset($err["ldap_graceattr"])) formerr($err["ldap_graceattr"]); 
@@ -336,8 +336,8 @@ if (!function_exists('ldap_connect')){ // Is php4-ldap really there?
 </tr>
 
 </tr>
-<tr valign="top" bgcolor="<?php echo $THEME->cellheading2 ?>">
-    <td align="right"><P>ldap_create_context:</td>
+<tr valign="top" class="required">
+    <td align="right">ldap_create_context:</td>
     <td>
     <input name="ldap_create_context" type="text" size="30" value="<?php echo $config->ldap_create_context?>">
     <?php  if (isset($err["ldap_create_context"])) formerr($err["ldap_create_context"]); ?>
@@ -353,8 +353,8 @@ if (!function_exists('ldap_connect')){ // Is php4-ldap really there?
    </td>
 </tr>
 
-<tr valign="top" bgcolor="<?php echo $THEME->cellheading2 ?>">
-        <td align="right"><P>ldap_creators:</td>
+<tr valign="top" class="required">
+        <td align="right">ldap_creators:</td>
         <td>
     <input name="ldap_creators" type="text" size="30" value="<?php echo $config->ldap_creators?>">
     <?php  if (isset($err["ldap_creators"])) formerr($err["ldap_creators"]); ?>
@@ -371,8 +371,8 @@ if (!function_exists('ldap_connect')){ // Is php4-ldap really there?
 </tr>
 
 
-<tr valign="top" bgcolor="<?php echo $THEME->cellheading2 ?>">
-    <td align="right"><P><?php  print_string("firstname") ?>:</td>
+<tr valign="top" class="required">
+    <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?>">
     <div align="right">
@@ -409,8 +409,8 @@ if (!function_exists('ldap_connect')){ // Is php4-ldap really there?
     </td>
 </tr>
 
-<tr valign="top" bgcolor="<?php echo $THEME->cellheading2 ?>">
-    <td align="right"><P><?php  print_string("lastname") ?>:</td>
+<tr valign="top" class="required">
+    <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?>">
     <div align="right">
@@ -439,8 +439,8 @@ if (!function_exists('ldap_connect')){ // Is php4-ldap really there?
     </td>
 </tr>
 
-<tr valign="top" bgcolor="<?php echo $THEME->cellheading2 ?>">
-    <td align="right"><P><?php  print_string("email") ?>:</td>
+<tr valign="top" class="required">
+    <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?>">
     <div align="right">
@@ -469,8 +469,8 @@ if (!function_exists('ldap_connect')){ // Is php4-ldap really there?
     </td>
 </tr>
 
-<tr valign="top" bgcolor="<?php echo $THEME->cellheading2 ?>">
-    <td align="right"><P><?php  print_string("phone") ?> 1:</td>
+<tr valign="top" class="required">
+    <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?>">
     <div align="right">
@@ -499,8 +499,8 @@ if (!function_exists('ldap_connect')){ // Is php4-ldap really there?
     </td>
 </tr>
 
-<tr valign="top" bgcolor="<?php echo $THEME->cellheading2 ?>">
-    <td align="right"><P><?php  print_string("phone") ?> 2:</td>
+<tr valign="top" class="required">
+    <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?>">
     <div align="right">
@@ -529,8 +529,8 @@ if (!function_exists('ldap_connect')){ // Is php4-ldap really there?
     </td>
 </tr>
 
-<tr valign="top" bgcolor="<?php echo $THEME->cellheading2 ?>">
-    <td align="right"><P><?php  print_string("department") ?>:</td>
+<tr valign="top" class="required">
+    <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?>">
     <div align="right">
@@ -559,8 +559,8 @@ if (!function_exists('ldap_connect')){ // Is php4-ldap really there?
     </td>
 </tr>
 
-<tr valign="top" bgcolor="<?php echo $THEME->cellheading2 ?>">
-    <td align="right"><P><?php  print_string("address") ?>:</td>
+<tr valign="top" class="required">
+    <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?>">
     <div align="right">
@@ -589,8 +589,8 @@ if (!function_exists('ldap_connect')){ // Is php4-ldap really there?
     </td>
 </tr>
 
-<tr valign="top" bgcolor="<?php echo $THEME->cellheading2 ?>">
-    <td align="right"><P><?php  print_string("city") ?>:</td>
+<tr valign="top" class="required">
+    <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?>">
     <div align="right">
@@ -619,8 +619,8 @@ if (!function_exists('ldap_connect')){ // Is php4-ldap really there?
     </td>
 </tr>
 
-<tr valign="top" bgcolor="<?php echo $THEME->cellheading2 ?>">
-    <td align="right"><P><?php  print_string("country") ?>:</td>
+<tr valign="top" class="required">
+    <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?>">
     <div align="right">
@@ -649,8 +649,8 @@ if (!function_exists('ldap_connect')){ // Is php4-ldap really there?
     </td>
 </tr>
 
-<tr valign="top" bgcolor="<?php echo $THEME->cellheading2 ?>">
-    <td align="right"><P><?php  print_string("description") ?>:</td>
+<tr valign="top" class="required">
+    <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?>">
     <div align="right">
@@ -679,8 +679,8 @@ if (!function_exists('ldap_connect')){ // Is php4-ldap really there?
     </td>
 </tr>
 
-<tr valign="top" bgcolor="<?php echo $THEME->cellheading2 ?>">
-    <td align="right"><P><?php  print_string("idnumber") ?>:</td>
+<tr valign="top" class="required">
+    <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?>">
     <div align="right">
@@ -709,8 +709,8 @@ if (!function_exists('ldap_connect')){ // Is php4-ldap really there?
     </td>
 </tr>
 
-<tr valign="top" bgcolor="<?php echo $THEME->cellheading2 ?>">
-    <td align="right"><P><?php  print_string("language") ?>:</td>
+<tr valign="top" class="required">
+    <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?>">
     <div align="right">
@@ -740,8 +740,8 @@ if (!function_exists('ldap_connect')){ // Is php4-ldap really there?
 </tr>
 
 
-<tr valign="top" bgcolor="<?php echo $THEME->cellheading2 ?>">
-    <td align="right"><P><?php  print_string("instructions", "auth") ?>:</td>
+<tr valign="top" class="required">
+    <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 fb278adcbd4..05682fe4d56 100644
--- a/auth/nntp/config.html
+++ b/auth/nntp/config.html
@@ -7,7 +7,7 @@
     }
 ?>
 
-<tr valign="top" bgcolor="<?php echo $THEME->cellheading2 ?>">
+<tr valign="top" class="required">
 	<td align="right">auth_nntphost:</td>
 	<td>
         <input name="auth_nntphost" type="text" size="30" value="<?php echo $config->auth_nntphost?>" />
@@ -19,7 +19,7 @@
     </td>
 </tr>
 
-<tr valign="top" bgcolor="<?php echo $THEME->cellheading2 ?>">
+<tr valign="top" class="required">
 	<td align="right">auth_nntpport:</td>
 	<td>
     <input name="auth_nntpport" type="text" size="6" value="<?php echo $config->auth_nntpport?>" />
diff --git a/auth/none/config.html b/auth/none/config.html
index ad9ab1e7ca3..660e38b7020 100644
--- a/auth/none/config.html
+++ b/auth/none/config.html
@@ -1 +1,2 @@
 <!-- No config needed -->
+<div align="center"><?php print_string('none'); ?></div>
diff --git a/auth/pop3/config.html b/auth/pop3/config.html
index 5f74a2accf7..6a5a2bbe968 100644
--- a/auth/pop3/config.html
+++ b/auth/pop3/config.html
@@ -12,7 +12,7 @@
         $config->auth_pop3mailbox = "INBOX";
     }
 ?>
-<tr valign="top" bgcolor="<?php echo $THEME->cellheading2 ?>">
+<tr valign="top" class="required">
 	<td align="right">auth_pop3host:</td>
 	<td>
         <input name="auth_pop3host" type="text" size="30" value="<?php echo $config->auth_pop3host?>" />
@@ -24,7 +24,7 @@
     </td>
 </tr>
 
-<tr valign="top" bgcolor="<?php echo $THEME->cellheading2 ?>">
+<tr valign="top" class="required">
 	<td align="right">auth_pop3type:</td>
 	<td>
     <?php  $pop3types = array("pop3","pop3cert", "pop3notls");
@@ -39,7 +39,7 @@
     </td>
 </tr>
 
-<tr valign="top" bgcolor="<?php echo $THEME->cellheading2 ?>">
+<tr valign="top" class="required">
 	<td align="right">auth_pop3port:</td>
 	<td>
     <input name="auth_pop3port" type="text" size="6" value="<?php echo $config->auth_pop3port?>" />
@@ -50,7 +50,7 @@
     </td>
 </tr>
 
-<tr valign="top" bgcolor="<?php echo $THEME->cellheading2 ?>">
+<tr valign="top" class="required">
 	<td align="right">auth_pop3mailbox:</td>
 	<td>
     <input name="auth_pop3mailbox" type="text" size="6" value="<?php echo $config->auth_pop3mailbox?>" />
diff --git a/auth/shibboleth/config.html b/auth/shibboleth/config.html
index 79d05d41fef..6418c5bfe4f 100755
--- a/auth/shibboleth/config.html
+++ b/auth/shibboleth/config.html
@@ -1,4 +1,19 @@
-<tr valign="top">
+<?php
+   if (!isset($config->shib_wayf_url)) {
+       $config->shib_wayf_url = '';
+   }
+   if (!isset($config->shib_logout_url)) {
+       $config->shib_logout_url = '';
+   }
+   if (!isset($config->shib_user_attribute)) {
+       $config->shib_user_attribute = '';
+   }
+   if (!isset($config->auth_user_guid)) {
+       $config->auth_user_guid = '';
+   }
+
+?>
+<tr valign="top" class="required">
     <td align="right">Shibboleth WAYF URL:</td>
     <td>
         <input name=shib_wayf_url type=text size=30 value="<?php echo $config->shib_wayf_url?>">
@@ -7,7 +22,7 @@
     <td>
     </td>
 </tr>
-<tr>
+<tr class="required">
     <td align="right">Shibboleth logout URL:</td>
     <td>
     <input name="shib_logout_url" type="text" size="30" value="<?php echo $config->shib_logout_url?>">