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.10 -r1.11
--- openacs-4/packages/acs-subsite/www/user/password-update.adp	15 Aug 2003 21:18:13 -0000	1.10
+++ openacs-4/packages/acs-subsite/www/user/password-update.adp	28 Aug 2003 09:41:42 -0000	1.11
@@ -1,12 +1,22 @@
 <master>
-<property name="title">#acs-subsite.Update_Password#</property>
-<property name="context_bar">#acs-subsite.lt_for_first_names_last_#</property>
-<property name="context">#acs-subsite.Update_Password#</property>
+  <property name="title">#acs-subsite.Update_Password#</property>
+  <property name="context_bar">#acs-subsite.lt_for_first_names_last_#</property>
+  <property name="context">#acs-subsite.Update_Password#</property>
+  <property name="focus">@focus@</property>
 
-<form method="post" action="password-update-2">
-  <input type="hidden" name="user_id" value="@user_id@" />
-  <input type="hidden" name="return_url" value="@return_url@" />
+<if @expired_p@ true>
+  <p>
+    Welcome to @system_name@. 
+  </p>
+  <p>
+    Your login was successful, but your password has expired, and must
+    be updated now, before you can proceed to use @system_name@.
+  </p>
+</if>
 
+<form method="post" action="password-update-2" name="pwd">
+  @export_vars@
+
 <table>
 
 <if @admin_p@ false and @password_old@ eq "">