Index: openacs-4/packages/acs-subsite/www/register/recover-password.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/recover-password.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-subsite/www/register/recover-password.adp	4 Sep 2003 16:35:04 -0000	1.5
+++ openacs-4/packages/acs-subsite/www/register/recover-password.adp	2 Oct 2003 12:18:07 -0000	1.6
@@ -1,7 +1,7 @@
 <master>
   <property name="title">@page_title@</property>
   <property name="context">@context@</property>
-  <property name="focus">recover.username</property>
+  <property name="focus">@focus;noquote@</property>
 
 <if @recover_info.password_message@ nil>
   <p> Enter your username to begin password recovery. </p>
Index: openacs-4/packages/acs-subsite/www/register/recover-password.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/recover-password.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/acs-subsite/www/register/recover-password.tcl	16 Sep 2003 13:08:38 -0000	1.8
+++ openacs-4/packages/acs-subsite/www/register/recover-password.tcl	2 Oct 2003 12:18:07 -0000	1.9
@@ -29,9 +29,11 @@
     set username_widget password
 }
 
+set focus {}
 if { [auth::UseEmailForLoginP] } {
     ad_form -extend -name recover -form [list [list email:text($username_widget) [list label "Email"]]]
     set user_id_widget_name email
+    set focus "email"
 } else {
     if { [llength $authority_options] > 1 } {
         ad_form -extend -name recover -form {
@@ -50,7 +52,9 @@
     }
 
     set user_id_widget_name username
+    set focus "username"
 }
+set focus "recover.$focus"