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.4 -r1.5
--- openacs-4/packages/acs-subsite/www/register/recover-password.adp	3 Sep 2003 19:48:05 -0000	1.4
+++ openacs-4/packages/acs-subsite/www/register/recover-password.adp	4 Sep 2003 16:35:04 -0000	1.5
@@ -1,14 +1,14 @@
 <master>
   <property name="title">@page_title@</property>
   <property name="context">@context@</property>
-  <property name="focus">@focus@</property>
+  <property name="focus">recover.username</property>
 
-<if @recover_info.password_message@ not nil>
-  @recover_info.password_message@
-  <p> To log in, visit the <a href="@login_url@">login page</a>. </p>
+<if @recover_info.password_message@ nil>
+  <p> Enter your username to begin password recovery. </p>
+  <formtemplate id="recover"></formtemplate>
 </if>
 <else>
-  <p> Enter your username to begin password recovery. </p>
-  <formtemplate id="recover_password"></formtemplate>
+  @recover_info.password_message@
+  <p> To log in, visit the <a href="@login_url@">login page</a>. </p>
 </else>