diff --git a/mozilla/webtools/bugzilla/CGI.pl b/mozilla/webtools/bugzilla/CGI.pl
index ad15503bf8a..a0a64fdad93 100644
--- a/mozilla/webtools/bugzilla/CGI.pl
+++ b/mozilla/webtools/bugzilla/CGI.pl
@@ -385,7 +385,7 @@ sub confirm_login {
         if (defined $::FORM{"PleaseMailAPassword"}) {
 	    my $realpwd;
             if ($realcryptpwd eq "") {
-		$realpwd = InsertNewUser($enteredlogin);
+		$realpwd = InsertNewUser($enteredlogin, "");
             } else {
                 SendSQL("select password from profiles where login_name = " .
 			SqlQuote($enteredlogin));
diff --git a/mozilla/webtools/bugzilla/changepassword.cgi b/mozilla/webtools/bugzilla/changepassword.cgi
index da9429b8ab0..66dff014bd5 100755
--- a/mozilla/webtools/bugzilla/changepassword.cgi
+++ b/mozilla/webtools/bugzilla/changepassword.cgi
@@ -33,9 +33,11 @@ if (! defined $::FORM{'pwd1'}) {
     if (Param('useqacontact')) {
         $qacontactpart = ", the current QA Contact";
     }
-    SendSQL("select emailnotification from profiles where login_name = " .
-            SqlQuote($::COOKIE{'Bugzilla_login'}));
-    my ($emailnotification) = (FetchSQLData());
+    my $loginname = SqlQuote($::COOKIE{'Bugzilla_login'});
+    SendSQL("select emailnotification,realname from profiles where login_name = " .
+            $loginname);
+    my ($emailnotification, $realname) = (FetchSQLData());
+    $realname = value_quote($realname);
     print qq{
 <form method=post>
 <hr>
@@ -47,6 +49,11 @@ if (! defined $::FORM{'pwd1'}) {
 <tr>
 <td align=right>Re-enter your new password:</td>
 <td><input type=password name="pwd2"></td>
+</tr>
+<tr>
+<td align=right>Your real name (optional):</td>
+<td><input size=35 name=realname value="$realname"></td>
+</tr>
 </table>
 <hr>
 <table>
@@ -122,6 +129,13 @@ Please click <b>Back</b> and try again.\n";
 SendSQL("update profiles set emailnotification='$::FORM{'emailnotification'}' where login_name = " .
         SqlQuote($::COOKIE{'Bugzilla_login'}));
 
+my $newrealname = $::FORM{'realname'};
+
+if ($newrealname ne "") {
+    $newrealname = SqlQuote($newrealname);
+    SendSQL("update profiles set realname=$newrealname where login_name = " .
+            SqlQuote($::COOKIE{'Bugzilla_login'}));
+}
 
 PutHeader("Preferences updated.");
 print "
diff --git a/mozilla/webtools/bugzilla/createaccount.cgi b/mozilla/webtools/bugzilla/createaccount.cgi
index 3d1fa4c58d2..cc9bdd018e8 100755
--- a/mozilla/webtools/bugzilla/createaccount.cgi
+++ b/mozilla/webtools/bugzilla/createaccount.cgi
@@ -44,6 +44,7 @@ Content-type: text/html
 PutHeader("Create a new bugzilla account");
 
 my $login = $::FORM{'login'};
+my $realname = $::FORM{'realname'};
 if (defined $login) {
     CheckEmailSyntax($login);
     if (DBname_to_id($login) != 0) {
@@ -53,7 +54,7 @@ if (defined $login) {
 	print "the <b>E-mail me a password</b> button.\n";
 	exit;
     }
-    my $password = InsertNewUser($login);
+    my $password = InsertNewUser($login, $realname);
     MailPassword($login, $password);
     print "A bugzilla account for <tt>$login</tt> has been created.  The\n";
     print "password has been e-mailed to that address.  When it is\n";
@@ -66,7 +67,8 @@ if (defined $login) {
 print q{
 To create a bugzilla account, all that you need to do is to enter a
 legitimate e-mail address.  The account will be created, and its
-password will be mailed to you.
+password will be mailed to you. Optionally you may enter your real name 
+as well.
 
 <FORM method=get>
 <table>
@@ -74,6 +76,10 @@ password will be mailed to you.
 <td align=right><b>E-mail address:</b></td>
 <td><input size=35 name=login></td>
 </tr>
+<tr>
+<td align=right><b>Real name:</b></td>
+<td><input size=35 name=realname></td>
+</tr>
 </table>
 <input type=submit>
 };
diff --git a/mozilla/webtools/bugzilla/globals.pl b/mozilla/webtools/bugzilla/globals.pl
index b667f48adbe..96ab4a0d269 100644
--- a/mozilla/webtools/bugzilla/globals.pl
+++ b/mozilla/webtools/bugzilla/globals.pl
@@ -353,7 +353,7 @@ sub GetVersionTable {
 
 
 sub InsertNewUser {
-    my ($username) = (@_);
+    my ($username, $realname) = (@_);
     my $password = "";
     for (my $i=0 ; $i<8 ; $i++) {
         $password .= substr("abcdefghijklmnopqrstuvwxyz", int(rand(26)), 1);
@@ -370,7 +370,9 @@ sub InsertNewUser {
         }
     }
             
-    SendSQL("insert into profiles (login_name, password, cryptpassword, groupset) values (@{[SqlQuote($username)]}, '$password', encrypt('$password'), $groupset)");
+    $username = SqlQuote($username);
+    $realname = SqlQuote($realname);
+    SendSQL("insert into profiles (login_name, realname, password, cryptpassword, groupset) values ($username, $realname, '$password', encrypt('$password'), $groupset)");
     return $password;
 }
 
@@ -406,7 +408,7 @@ sub DBNameToIdAndCheck {
         return $result;
     }
     if ($forceok) {
-        InsertNewUser($name);
+        InsertNewUser($name, "");
         $result = DBname_to_id($name);
         if ($result > 0) {
             return $result;