Index: openacs-4/packages/acs-authentication/tcl/authentication-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-authentication/tcl/authentication-procs.tcl,v
diff -u -r1.41 -r1.42
--- openacs-4/packages/acs-authentication/tcl/authentication-procs.tcl	24 Sep 2003 15:17:12 -0000	1.41
+++ openacs-4/packages/acs-authentication/tcl/authentication-procs.tcl	24 Sep 2003 17:30:59 -0000	1.42
@@ -389,12 +389,6 @@
     # This holds element error messages
     array set element_messages [list]
 
-    # Initialize username to email
-    if { [auth::UseEmailForLoginP] && [empty_string_p $username] } {
-        set username $email
-    }
-
-
     #####
     #
     # Create local account
@@ -428,6 +422,9 @@
         return [array get creation_info]
     }
 
+    # Need to find out which username was set
+    set username $creation_info(username)
+
     # Save the local account information for later
     set local_account_status $creation_info(account_status)
     set local_account_message $creation_info(account_message)
@@ -848,6 +845,11 @@
     }
 
     set result(user_id) $user_id
+
+    if { [empty_string_p $username] } {
+        set username [acs_user::get_element -user_id $user_id -element username]
+    }
+    set result(username) $username
     
     # Creation succeeded
     set result(creation_status) "ok"