Index: openacs-4/packages/acs-subsite/www/register/email-password-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/Attic/email-password-2.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/register/email-password-2.tcl	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/register/email-password-2.tcl	9 Sep 2001 14:02:45 -0000	1.2
@@ -35,6 +35,7 @@
 
 # Use exists
 
+set ask_question_p 0
 if [exists_and_not_null answer] {
     # There was a question
     set value [db_string password_answer "select password_answer from users where user_id = :user_id"]
@@ -44,8 +45,6 @@
 	set validated_p 0
     }
 
-    set ask_question_p 0
-
 } else {
     # We check their first and last names
     
@@ -96,4 +95,4 @@
 set system_owner [ad_system_owner]
 set system_name [ad_system_name]
 
-ad_return_template
\ No newline at end of file
+ad_return_template
Index: openacs-4/packages/acs-subsite/www/register/email-password-2.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/Attic/email-password-2.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/register/email-password-2.xql	1 May 2001 21:20:18 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/register/email-password-2.xql	9 Sep 2001 14:02:45 -0000	1.2
@@ -5,7 +5,6 @@
       <querytext>
       select 
 email from cc_users where user_id=:user_id
--- and user_state in ('authorized','deleted')
       </querytext>
 </fullquery>
 
@@ -19,7 +18,7 @@
  
 <fullquery name="first_last_name">      
       <querytext>
-      select first_names db_first_names, last_name db_last_name from cc_users where user_id = $user_id
+      select first_names as db_first_names, last_name as db_last_name from cc_users where user_id = $user_id
       </querytext>
 </fullquery>
 
Index: openacs-4/packages/acs-subsite/www/register/email-password-3.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/Attic/email-password-3.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/register/email-password-3.xql	1 May 2001 21:20:18 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/register/email-password-3.xql	9 Sep 2001 14:02:45 -0000	1.2
@@ -3,7 +3,7 @@
 
 <fullquery name="first_last_names">      
       <querytext>
-      select first_names db_first_names, last_name db_last_name, password_question from cc_users where user_id = :user_id
+      select first_names as db_first_names, last_name as db_last_name, password_question from cc_users where user_id = :user_id
       </querytext>
 </fullquery>