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 -N -r1.73 -r1.73.2.1
--- openacs-4/packages/acs-authentication/tcl/authentication-procs.tcl	13 Mar 2005 23:51:14 -0000	1.73
+++ openacs-4/packages/acs-authentication/tcl/authentication-procs.tcl	27 Jul 2005 04:05:36 -0000	1.73.2.1
@@ -1213,12 +1213,30 @@
         if { [string equal $info_result(info_status) "ok"] } {
 
             array set user $info_result(user_info)
-            set user(user_id) [auth::create_local_account \
+            array set creation_info [auth::create_local_account \
                                    -authority_id $authority_id \
                                    -username $username \
                                    -array user]
-            acs_user::get -authority_id $authority_id -username $username -array user
 
+	    if { [string equal $creation_info(creation_status) "ok"] } {
+		acs_user::get -authority_id $authority_id -username $username -array user
+	    } else {
+		set auth_info(account_status) "closed"
+		# Used to get help contact info
+		auth::authority::get -authority_id $authority_id -array authority
+		set system_name [ad_system_name]
+		set auth_info(account_message) "You have successfully authenticated, but we were unable to create an account for you on $system_name. "
+		append auth_info(account_message) "The error was: $creation_info(element_messages). Please contact the system administrator." 
+		
+		if { ![empty_string_p $authority(help_contact_text)] } {
+		    append auth_info(account_message) "<p><h3>Help Information</h3>"
+		    append auth_info(account_message) [ad_html_text_convert \
+							   -from $authority(help_contact_text_format) \
+							   -to "text/html" -- $authority(help_contact_text)]
+		}
+		return [array get auth_info]
+	    }
+
         } else {
         
             # Local user account doesn't exist