Index: openacs-4/packages/acs-authentication/tcl/password-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-authentication/tcl/password-procs.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/acs-authentication/tcl/password-procs.tcl	29 Sep 2003 09:49:40 -0000	1.8
+++ openacs-4/packages/acs-authentication/tcl/password-procs.tcl	2 Oct 2003 12:43:39 -0000	1.9
@@ -230,16 +230,16 @@
                     -password $result(password) \
                     -subject_msg_key "acs-subsite.email_subject_Forgotten_password" \
                     -body_msg_key "acs-subsite.email_body_Forgotten_password" 
-
-                # Successfully informed user of email
-                set result(password_message) [_ acs-subsite.Check_Your_Inbox]
             } {
                 # We could not inform the user of his email - we failed
                 set result(password_status) "failed_to_connect"
                 set result(password_message) [_ acs-subsite.Error_sending_mail]
                 global errorInfo
                 ns_log Error "We had an error sending out email with new password to username $username, authority $authority_id:\n$errorInfo"
             }
+        } 
+        if { ![exists_and_not_null result(password_message)] } {
+            set result(password_message) [_ acs-subsite.Check_Your_Inbox]
         }
     }