--- loncom/interface/loncreateuser.pm	2007/12/05 16:49:55	1.198
+++ loncom/interface/loncreateuser.pm	2007/12/05 17:40:29	1.201
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Create a user
 #
-# $Id: loncreateuser.pm,v 1.198 2007/12/05 16:49:55 raeburn Exp $
+# $Id: loncreateuser.pm,v 1.201 2007/12/05 17:40:29 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -718,9 +718,6 @@ $lt{'hs'}: $home_server_pick
         } else {
             $r->print($home_server_pick);
         }
-        if ($context eq 'domain') {
-            $r->print(&Apache::lonuserutils::forceid_change());
-        }
         $r->print('</div>'."\n".'<div class="LC_left_float"><h3>'.
                   $lt{'lg'}.'</h3>');
         my ($fixedauth,$varauth,$authmsg); 
@@ -788,8 +785,11 @@ $forminfo
 ENDCHANGEUSER
         $r->print('<div class="LC_left_float">'.
                   &personal_data_display($ccuname,$ccdomain,$newuser,
-                                         %inst_results).
-                  '</div>');
+                                         %inst_results));
+        if ($context eq 'domain') {
+            $r->print(&Apache::lonuserutils::forceid_change());
+        }
+        $r->print('</div>');
         my $user_auth_text = 
             &user_authentication($ccuname,$ccdomain,$krbdefdom,\%abv_auth);
         my $user_quota_text;
@@ -1198,6 +1198,10 @@ ENDBADAUTH
         }
     } else { # Authentication type is valid
         &initialize_authen_forms($ccdomain,$currentauth);
+        my $authformnop_row;
+        if (&Apache::lonnet::allowed('mau',$ccdomain)) {
+            $authformnop_row = &Apache::loncommon::start_data_table_row();
+        }
         my ($authformcurrent,$authform_other,$can_modify) =
             &modify_login_block($ccdomain,$currentauth);
         if (&Apache::lonnet::allowed('mau',$ccdomain)) {
@@ -1213,7 +1217,7 @@ ENDBADAUTH
                        '</script>'."\n".
                        '<h3>'.$lt{'ld'}.'</h3>'.
                        &Apache::loncommon::start_data_table().
-                       &Apache::loncommon::start_data_table_row().
+                       $authformnop_row.
                        '<td>'.$authformnop;
             if ($can_modify) {
                 $outcome .= '</td>'."\n".
@@ -1222,7 +1226,8 @@ ENDBADAUTH
                             '<td>'.$authformcurrent.'</td>'.
                             &Apache::loncommon::end_data_table_row()."\n";
             } else {
-                $outcome .= '&nbsp;('.$authformcurrent.')</td>';
+                $outcome .= '&nbsp;('.$authformcurrent.')</td>'.
+                            &Apache::loncommon::end_data_table_row()."\n";
             }
             if ($authform_other ne '') {
                 $outcome .= $authform_other;
@@ -1695,18 +1700,23 @@ sub update_user_data {
                              'prvs' => "Previous",
                              'chto' => "Changed To"
 						   );
+                $r->print('<h4>'.$lt{'uic'}.'</h4>'.
+                          &Apache::loncommon::start_data_table().
+                          &Apache::loncommon::start_data_table_header_row());
                 $r->print(<<"END");
-<table border="2">
-<caption>$lt{'uic'}</caption>
-<tr><th>&nbsp;</th>
+    <th>&nbsp;</th>
     <th>$lt{'frst'}</th>
     <th>$lt{'mddl'}</th>
     <th>$lt{'lst'}</th>
     <th>$lt{'gen'}</th>
     <th>$lt{'id'}</th>
     <th>$lt{'mail'}</th>
-    <th>$lt{'disk'}</th></tr>
-<tr><td>$lt{'prvs'}</td>
+    <th>$lt{'disk'}</th>
+END
+                $r->print(&Apache::loncommon::end_data_table_header_row().
+                          &Apache::loncommon::start_data_table_row());
+                $r->print(<<"END");
+    <td><b>$lt{'prvs'}</b></td>
     <td>$userenv{'firstname'}  </td>
     <td>$userenv{'middlename'} </td>
     <td>$userenv{'lastname'}   </td>
@@ -1714,17 +1724,21 @@ sub update_user_data {
     <td>$userenv{'id'}</td>
     <td>$userenv{'permanentemail'} </td>
     <td>$oldportfolioquota Mb</td>
-</tr>
-<tr><td>$lt{'chto'}</td>
+END
+                $r->print(&Apache::loncommon::end_data_table_row().
+                          &Apache::loncommon::start_data_table_row());
+                $r->print(<<"END");
+    <td><b>$lt{'chto'}</b></td>
     <td>$env{'form.cfirstname'}  </td>
     <td>$env{'form.cmiddlename'} </td>
     <td>$env{'form.clastname'}   </td>
     <td>$env{'form.cgeneration'} </td>
     <td>$env{'form.cid'} </td>
     <td>$env{'form.cpermanentemail'} </td>
-    <td>$newportfolioquota Mb $defquotatext </td></tr>
-</table>
+    <td>$newportfolioquota Mb $defquotatext </td>
 END
+                $r->print(&Apache::loncommon::end_data_table_row().
+                          &Apache::loncommon::end_data_table());
                 if (($forceid) && ($recurseid) && (!$disallowed_id) &&
                     (&Apache::lonnet::allowed('mau',$env{'form.ccdomain'}))) {
                     my %userupdate = (