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.13 -r1.14
--- openacs-4/packages/acs-subsite/www/user/password-update.adp	1 Sep 2003 11:41:01 -0000	1.13
+++ openacs-4/packages/acs-subsite/www/user/password-update.adp	3 Sep 2003 08:33:34 -0000	1.14
@@ -1,9 +1,8 @@
 <master>
   <property name="title">#acs-subsite.Update_Password#</property>
   <property name="context_bar">#acs-subsite.lt_for_first_names_last_#</property>
-  <property name="context">@context@</property>
-  <property name="focus">@focus@</property>
-
+  <property name="context">#acs-subsite.Update_Password#</property>
+  <property name="focus">pwd.old_password</property>
 <if @expired_p@ true>
   <p>
     Welcome to @system_name@. 
@@ -15,33 +14,29 @@
 </if>
 
 <form method="post" action="password-update-2" name="pwd">
-  @export_vars;noquote@
-
+ <input type="hidden" name="return_url" value="@return_url@" /> <input type="hidden" name="user_id" value="@user_id@" />
 <table>
 
-<if @admin_p@ false and @password_old@ eq "">
-  <tr>
-    <th>#acs-subsite.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>
+<tr>
+  <th>#acs-subsite.Current_Password#</th>
+  <td><input type="password" name="old_password" size="15" /></td>
+</tr>
 
-  <tr>
-    <th>#acs-subsite.New_Password#</th>
-    <td><input type="password" name="password_1" size="15" /></td>
-  </tr>
+<tr>
+  <th>#acs-subsite.New_Password#</th>
+  <td><input type="password" name="password_1" size="15" /></td>
+</tr>
 
-  <tr>
-    <th>#acs-subsite.Confirm#</th>
-    <td><input type="password" name="password_2" size="15" /></td>
-  </tr>
+<tr>
+  <th>#acs-subsite.Confirm#</th>
+  <td><input type="password" name="password_2" size="15" /></td>
+</tr>
+
+<tr>
+  <th></th>
+  <td><input type="submit" value="#acs-subsite.Update#" /></td>
+</tr>
+
 </table>
 
-<p><center>
-  <input type="submit" value="#acs-subsite.Update#" />
-</center>
-</p>
 </form>