Index: openacs-4/packages/acs-authentication/tcl/local-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-authentication/tcl/local-procs.tcl,v
diff -u -r1.26.2.4 -r1.26.2.5
--- openacs-4/packages/acs-authentication/tcl/local-procs.tcl	17 Aug 2004 12:00:34 -0000	1.26.2.4
+++ openacs-4/packages/acs-authentication/tcl/local-procs.tcl	24 Aug 2004 20:43:43 -0000	1.26.2.5
@@ -313,7 +313,7 @@
     }
 
     # Reset the password
-    if [exists_and_not_null new_password] {
+    if ![exists_and_not_null new_password] {
 	set password $new_password
     } else {
 	set password [ad_generate_random_string]
Index: openacs-4/packages/acs-subsite/catalog/acs-subsite.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/catalog/acs-subsite.en_US.ISO-8859-1.xml,v
diff -u -r1.51.2.3 -r1.51.2.4
--- openacs-4/packages/acs-subsite/catalog/acs-subsite.en_US.ISO-8859-1.xml	13 May 2004 15:16:14 -0000	1.51.2.3
+++ openacs-4/packages/acs-subsite/catalog/acs-subsite.en_US.ISO-8859-1.xml	24 Aug 2004 20:43:17 -0000	1.51.2.4
@@ -340,7 +340,8 @@
   <msg key="This_group_is_closed">This group is closed. New members can only get access by invitation.</msg>
   <msg key="this_subsite">this subsite</msg>
   <msg key="This_user_has_left_the">This user has left the community.</msg>
-  <msg key="To_log_in_visit_the">To log in, visit the</msg>
+  <msg key="To_log_in_visit_the"> Please check your inbox. Within the next few minutes, you should find a message from %system_owner% with instructions on
+</msg>
   <msg key="Topic">Topic</msg>
   <msg key="type_specific_info">type-specific info</msg>
   <msg key="UP">UP</msg>
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.9 -r1.9.4.1
--- openacs-4/packages/acs-subsite/www/register/recover-password.tcl	2 Oct 2003 12:18:07 -0000	1.9
+++ openacs-4/packages/acs-subsite/www/register/recover-password.tcl	24 Aug 2004 20:43:19 -0000	1.9.4.1
@@ -75,3 +75,4 @@
     set login_url [ad_get_login_url -authority_id $authority_id -username $username]
 }
 
+set system_owner [ad_system_owner]
\ No newline at end of file