Index: openacs-4/packages/acs-subsite/www/register/awaiting-approval.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/Attic/awaiting-approval.tcl,v
diff -u -N -r1.1.1.1 -r1.1.1.1.2.1
--- openacs-4/packages/acs-subsite/www/register/awaiting-approval.tcl	13 Mar 2001 22:59:26 -0000	1.1.1.1
+++ openacs-4/packages/acs-subsite/www/register/awaiting-approval.tcl	31 Mar 2002 20:40:09 -0000	1.1.1.1.2.1
@@ -10,7 +10,7 @@
 
 if {![db_0or1row register_member_state_information "select member_state, email, email_verified_p, rel_id
 from cc_users where user_id = :user_id 
-and  (member_state is null or member_state = 'rejected')"]} {
+and  (member_state is null or member_state = 'rejected' or member_state = 'needs approval')"]} {
     ad_return_error "Couldn't find your record" "User id $user_id is not in the awaiting approval state.  This is probably our programming bug."
     return
 }
Index: openacs-4/packages/acs-subsite/www/register/awaiting-approval.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/Attic/awaiting-approval.xql,v
diff -u -N -r1.1 -r1.1.2.1
--- openacs-4/packages/acs-subsite/www/register/awaiting-approval.xql	1 May 2001 21:20:18 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/register/awaiting-approval.xql	31 Mar 2002 20:40:09 -0000	1.1.2.1
@@ -5,7 +5,7 @@
       <querytext>
       select member_state, email, email_verified_p, rel_id
 from cc_users where user_id = :user_id 
-and  (member_state is null or member_state = 'rejected')
+and  (member_state is null or member_state = 'rejected' or member_state = 'needs approval')
       </querytext>
 </fullquery>
 
Index: openacs-4/packages/acs-subsite/www/register/email-confirm.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/email-confirm.tcl,v
diff -u -N -r1.2 -r1.2.2.1
--- openacs-4/packages/acs-subsite/www/register/email-confirm.tcl	2 Sep 2001 16:38:48 -0000	1.2
+++ openacs-4/packages/acs-subsite/www/register/email-confirm.tcl	31 Mar 2002 20:40:09 -0000	1.2.2.1
@@ -44,7 +44,7 @@
                         set email_verified_p = 't'
                         where user_id = :user_id" 
 
-} elseif { $member_state == "" && $email_verified_p == "f" } {
+} elseif { $member_state == "needs approval" && $email_verified_p == "f" } {
     #state is need_email_verification_and_admin_approv
     db_dml register_email_confirm_update3 "update users
                         set email_verified_p = 't'
Index: openacs-4/packages/acs-subsite/www/register/user-login.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/Attic/user-login.tcl,v
diff -u -N -r1.1.1.1 -r1.1.1.1.2.1
--- openacs-4/packages/acs-subsite/www/register/user-login.tcl	13 Mar 2001 22:59:26 -0000	1.1.1.1
+++ openacs-4/packages/acs-subsite/www/register/user-login.tcl	31 Mar 2002 20:40:09 -0000	1.1.1.1.2.1
@@ -75,7 +75,7 @@
 	ad_returnredirect "awaiting-approval?user_id=$user_id"
 	return
     }
-    "" {
+    "needs approval" {
 	ad_returnredirect "awaiting-approval?user_id=$user_id"
 	return
     }
Index: openacs-4/packages/acs-subsite/www/register/user-new.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/user-new.adp,v
diff -u -N -r1.1.1.1.2.1 -r1.1.1.1.2.2
--- openacs-4/packages/acs-subsite/www/register/user-new.adp	9 Mar 2002 23:12:37 -0000	1.1.1.1.2.1
+++ openacs-4/packages/acs-subsite/www/register/user-new.adp	31 Mar 2002 20:40:09 -0000	1.1.1.1.2.2
@@ -36,7 +36,15 @@
   offer to email it to you.
 
 </if>
+<else>
+  <h3>Security</h3>
 
+  We will generate and send to you a random password when your registration
+  is confirmed. Once you login, you can change your password.
+  <input type="hidden" name="password" value="somevalue">
+  <input type="hidden" name="password_confirmation" value="othervalue">
+</else>
+
 <h3>About You</h3>
 
 We know your email address already: "@email@".  But we need your full