Index: openacs-4/packages/acs-subsite/www/register/email-password-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/Attic/email-password-2.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-subsite/www/register/email-password-2.tcl	14 Apr 2002 04:34:36 -0000	1.3
+++ openacs-4/packages/acs-subsite/www/register/email-password-2.tcl	15 Apr 2002 22:40:50 -0000	1.4
@@ -50,8 +50,9 @@
 }
 
 if {!$validated_p} {
-    # Unauthorized Access
-    ad_return_error "Unauthorized Access" "The validation didn't match what we had.  Either press back on the browser and retype it in, or <a href=\"/register\">go back to the login page</a>."
+    ad_return_error \
+        "Unauthorized Access" \
+        "The validation didn't match what we had. Either press back on the browser and retype it in, or <a href=\"/register\">go back to the login page</a>."
     return
 }
 
@@ -64,19 +65,31 @@
 set system_owner [ad_system_owner]
 set system_name [ad_system_name]
 
-# Send email
-if [catch {ns_sendmail $email $system_owner "Your forgotten password on $system_name" "Here's how you can log in at [ad_url]:
+set subject "Your forgotten password on $system_name"
+set body "Please follow the following link to reset your password:
 
-Username:  $email
-Password:  $password
+[ad_url]/user/password-update?[export_vars {{password_old $password}}]
 
-"} errmsg] {
-    ad_return_error "Error sending mail" "Now we're really in trouble because we got an error trying to send you email:
+"
+
+# Send email
+if [catch {ns_sendmail $email $system_owner $subject $body} errmsg] {
+    ad_return_error \
+        "Error sending mail" \
+        "Now we're really in trouble because we got this error:
 <blockquote>
   <pre>
     $errmsg
   </pre>
 </blockquote>
+when trying to send you the following email:
+<blockquote>
+  <pre>
+Subject: $subject
+
+$body
+  </pre>
+</blockquote>
 "
     return
 }
Index: openacs-4/packages/acs-subsite/www/user/password-update-2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/user/Attic/password-update-2.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/user/password-update-2.adp	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/user/password-update-2.adp	15 Apr 2002 22:40:50 -0000	1.2
@@ -1,5 +1,5 @@
 <master>
-<property name=title>Password Updated</property>
+<property name="title">Password Updated</property>
 
 <h2>Password Updated</h2>
 
@@ -8,4 +8,3 @@
 <hr>
 
 You can @return_link@
-
Index: openacs-4/packages/acs-subsite/www/user/password-update-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/user/Attic/password-update-2.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-subsite/www/user/password-update-2.tcl	3 Apr 2002 20:33:18 -0000	1.2
+++ openacs-4/packages/acs-subsite/www/user/password-update-2.tcl	15 Apr 2002 22:40:50 -0000	1.3
@@ -5,7 +5,7 @@
     <li>password_1 matches password_2
 
     @cvs-id $Id$
-} {
+} -query {
     password_1
     password_2
     {password_old ""}
Index: openacs-4/packages/acs-subsite/www/user/password-update.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/user/password-update.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/user/password-update.adp	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/user/password-update.adp	15 Apr 2002 22:40:50 -0000	1.2
@@ -1,33 +1,43 @@
 <master>
-<property name=title>Update Password</property>
+<property name="title">Update Password</property>
 
 <h2>Update Password</h2>
 
 for @first_names@ @last_name@ in @site_link@
 
 <hr>
 
-<form method=POST action="password-update-2">
+<form method="post" action="password-update-2">
 @export_vars@
+
 <table>
 
-<if @admin_enabled_p@ eq 0>
-<tr>
-    <th>Current Password:<td><input type=password name=password_old size=15>
-</tr>
+<if @admin_enabled_p@ false>
+<if @password_old@ eq "">
+  <tr>
+    <th>Current Password:</th>
+    <td><input type="password" name="password_old" size="15"></td>
+  </tr>
 </if>
+<else>
+  <input type="hidden" name="password_old" value=@password_old@>
+</else>
+</if>
 
-<tr>
- <th>New Password:<td><input type=password name=password_1 size=15>
-</tr>
-<tr>
- <th>Confirm:<td><input type=password name=password_2 size=15>
-</tr>
+  <tr>
+    <th>New Password:</th>
+    <td><input type="password" name="password_1" size="15"></td>
+  </tr>
+
+  <tr>
+    <th>Confirm:</th>
+    <td><input type="password" name="password_2" size="15"></td>
+  </tr>
 </table>
 
 <br>
 <br>
+
 <center>
-<input type=submit value="Update">
+  <input type="submit" value="Update">
 </center>
-
Index: openacs-4/packages/acs-subsite/www/user/password-update.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/user/password-update.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-subsite/www/user/password-update.tcl	3 Apr 2002 20:33:18 -0000	1.2
+++ openacs-4/packages/acs-subsite/www/user/password-update.tcl	15 Apr 2002 22:40:50 -0000	1.3
@@ -6,6 +6,7 @@
 } {
     {user_id ""}
     {return_url ""}
+    {password_old ""}
 } -properties {
     first_names:onevalue
     last_name:onevalue
@@ -27,8 +28,7 @@
 
 set bind_vars [ad_tcl_vars_to_ns_set user_id]
 
-db_1row user_information "select first_names,
-last_name, email, url from cc_users where user_id=:user_id" -bind $bind_vars
+db_1row user_information {}
 
 if {$admin_enabled_p} {
     set export_vars [export_form_vars return_url user_id]
Index: openacs-4/packages/acs-subsite/www/user/password-update.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/user/Attic/password-update.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/user/password-update.xql	1 May 2001 21:21:15 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/user/password-update.xql	15 Apr 2002 22:40:50 -0000	1.2
@@ -1,12 +1,15 @@
 <?xml version="1.0"?>
 <queryset>
 
-<fullquery name="user_information">      
-      <querytext>
-      select first_names, 
-last_name, email, url from cc_users where user_id=:user_id
-      </querytext>
-</fullquery>
-
+    <fullquery name="user_information">      
+        <querytext>
+            select first_names, 
+                   last_name,
+                   email,
+                   url
+            from cc_users
+            where user_id = :user_id
+        </querytext>
+    </fullquery>
  
 </queryset>