diff -Naru -x '*~' /home/httpd/html/moodle.orig/login/signup_form.html /home/httpd/html/moodle/login/signup_form.html
--- /home/httpd/html/moodle.orig/login/signup_form.html	2005-05-24 15:07:11.000000000 +0900
+++ /home/httpd/html/moodle/login/signup_form.html	2005-11-14 00:17:27.000000000 +0900
@@ -60,18 +60,38 @@
     <?php if (!empty($err->email2)) { formerr($err->email2); } ?>
     </td>
 </tr>
-<tr valign="top">
+
+<?php 
+$nameordercheck->firstname = "a";
+$nameordercheck->lastname  = "b";
+if ( fullname($nameordercheck) == "b a" ){ ?>
+  <tr valign="top">
+    <td align="right"><?php print_string("lastname") ?>:</td>
+    <td><input type="text" name="lastname" size="25" value="<?php p($user->lastname) ?>" alt="<?php print_string("lastname") ?>" />
+    <?php if (!empty($err->lastname)) { formerr($err->lastname);} ?>
+    </td>
+  </tr>
+  <tr valign="top">
     <td align="right"><?php print_string("firstname") ?>:</td>
     <td><input type="text" name="firstname" size="25" value="<?php p($user->firstname) ?>" alt="<?php print_string("firstname") ?>" />
     <?php if (!empty($err->firstname)) { formerr($err->firstname);} ?>
     </td>
-</tr>
-<tr valign="top">
+  </tr>
+<?php }else{ ?>
+  <tr valign="top">
+    <td align="right"><?php print_string("firstname") ?>:</td>
+    <td><input type="text" name="firstname" size="25" value="<?php p($user->firstname) ?>" alt="<?php print_string("firstname") ?>" />
+    <?php if (!empty($err->firstname)) { formerr($err->firstname);} ?>
+    </td>
+  </tr>
+  <tr valign="top">
     <td align="right"><?php print_string("lastname") ?>:</td>
     <td><input type="text" name="lastname" size="25" value="<?php p($user->lastname) ?>" alt="<?php print_string("lastname") ?>" />
     <?php if (!empty($err->lastname)) { formerr($err->lastname);} ?>
     </td>
-</tr>
+  </tr>
+<?php } ?>
+
 <tr valign="top">
     <td align="right"><?php print_string("city") ?>:</td>
     <td><input type="text" name="city" size="25" value="<?php p($user->city) ?>" alt="<?php print_string("city") ?>" />
diff -Naru -x '*~' /home/httpd/html/moodle.orig/user/edit.html /home/httpd/html/moodle/user/edit.html
--- /home/httpd/html/moodle.orig/user/edit.html	2005-07-06 11:19:30.000000000 +0900
+++ /home/httpd/html/moodle/user/edit.html	2005-11-14 00:31:14.000000000 +0900
@@ -85,20 +85,44 @@
 }
 
 ?>
-<tr>
+
+
+<?php 
+$nameordercheck->firstname = "a";
+$nameordercheck->lastname  = "b";
+if ( fullname($nameordercheck) == "b a" ){ ?>
+  <tr>
+    <th><?php print_string("lastname") ?>:</th>
+    <td>
+    <input type="text" name="lastname" size="30" alt="<?php print_string("lastname") ?>" maxlength="20" value="<?php p($user->lastname) ?>" />
+    <?php if (isset($err["lastname"])) formerr($err["lastname"]); ?>
+    </td>
+  </tr>
+  <tr>
     <th><?php print_string("firstname") ?>:</th>
     <td>
     <input type="text" name="firstname" size="30" alt="<?php print_string("firstname") ?>" maxlength="20" value="<?php p($user->firstname) ?>" />
     <?php if (isset($err["firstname"])) formerr($err["firstname"]); ?>
     </td>
-</tr>
-<tr>
+  </tr>
+<?php }else{ ?>
+  <tr>
+    <th><?php print_string("firstname") ?>:</th>
+    <td>
+    <input type="text" name="firstname" size="30" alt="<?php print_string("firstname") ?>" maxlength="20" value="<?php p($user->firstname) ?>" />
+    <?php if (isset($err["firstname"])) formerr($err["firstname"]); ?>
+    </td>
+  </tr>
+  <tr>
     <th><?php print_string("lastname") ?>:</th>
     <td>
     <input type="text" name="lastname" size="30" alt="<?php print_string("lastname") ?>" maxlength="20" value="<?php p($user->lastname) ?>" />
     <?php if (isset($err["lastname"])) formerr($err["lastname"]); ?>
     </td>
-</tr>
+  </tr>
+<?php } ?>
+
+
 <tr>
     <th><?php print_string("email") ?>:</th>
     <td>