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.3 -r1.4
--- openacs-4/packages/acs-subsite/www/register/recover-password.adp	3 Sep 2003 14:06:01 -0000	1.3
+++ openacs-4/packages/acs-subsite/www/register/recover-password.adp	3 Sep 2003 19:48:05 -0000	1.4
@@ -3,17 +3,12 @@
   <property name="context">@context@</property>
   <property name="focus">@focus@</property>
 
-	Enter your username to begin password recovery.
+<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>
+<else>
+  <p> Enter your username to begin password recovery. </p>
+  <formtemplate id="recover_password"></formtemplate>
+</else>
 
-  <if @username@ not nil>
-    <if @form_submitted_p@ false or @form_valid_p@ true>
-      @recover_info.password_message@
-    </if>
-    <else>
-      <formtemplate id="recover_password"></formtemplate>
-    </else>
-  </if>
-  <else>
-    <formtemplate id="recover_password"></formtemplate>
-  </else>
-