Index: openacs-4/packages/acs-subsite/lib/login.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/lib/login.tcl,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/acs-subsite/lib/login.tcl	19 Sep 2003 15:00:13 -0000	1.11
+++ openacs-4/packages/acs-subsite/lib/login.tcl	22 Sep 2003 08:22:26 -0000	1.12
@@ -187,6 +187,10 @@
         }
     }
 
+    if { [exists_and_not_null auth_info(account_url)] } {
+        ad_returnredirect $auth_info(account_url)
+        ad_script_abort
+    }
 
     # Handle account status
     switch $auth_info(account_status) {
Index: openacs-4/packages/acs-subsite/lib/user-info.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/lib/user-info.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-subsite/lib/user-info.adp	17 Sep 2003 12:03:00 -0000	1.2
+++ openacs-4/packages/acs-subsite/lib/user-info.adp	22 Sep 2003 08:22:26 -0000	1.3
@@ -1,5 +1,4 @@
 <property name="focus">@focus;noquote@</property>
-
 <formtemplate id="user_info"></formtemplate>
 
 <if @edit_mode_p@ true and @read_only_notice_p@ true>
Index: openacs-4/packages/acs-subsite/lib/user-info.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/lib/user-info.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/acs-subsite/lib/user-info.tcl	18 Sep 2003 17:12:53 -0000	1.6
+++ openacs-4/packages/acs-subsite/lib/user-info.tcl	22 Sep 2003 08:22:26 -0000	1.7
@@ -3,14 +3,15 @@
 #  user_id:optional
 #  return_url:optional
 #  edit_p:optional
+#  message:optional
 #
 
 auth::require_login -account_status closed
 
 if { ![exists_and_not_null user_id] } {
     set user_id [ad_conn untrusted_user_id]
 } else {
-    permission::require_permission -object_id $user_id -privilege admin -party_id $user_id
+    permission::require_permission -object_id $user_id -privilege admin
 }
 
 if { ![exists_and_not_null return_url] } {
@@ -33,7 +34,7 @@
 }
 set first_element {}
 foreach elm $form_elms {
-    if { [empty_string_p $elm_mode($elm)] } {
+    if { [empty_string_p $elm_mode($elm)] && (![string equal $elm "username"] && [auth::UseEmailForLoginP]) } {
         set first_element $elm
         break
     }
@@ -49,7 +50,8 @@
 
 ad_form -name user_info -cancel_url $return_url -action $action_url -mode $form_mode -form {
     {user_id:integer(hidden),optional}
-    {return_url:text(hidden),optional {value $return_url}}
+    {return_url:text(hidden),optional}
+    {message:text(hidden),optional}
 }
 
 if { [llength [auth::authority::get_authority_options]] > 1 } {
Index: openacs-4/packages/acs-subsite/www/resources/site-master.css
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/resources/site-master.css,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-subsite/www/resources/site-master.css	21 Sep 2003 19:20:47 -0000	1.2
+++ openacs-4/packages/acs-subsite/www/resources/site-master.css	22 Sep 2003 08:22:26 -0000	1.3
@@ -84,7 +84,7 @@
 
 #navbar { 
   padding-top: 4px; 
-  font-size: 80%;
+  font-size: 85%;
 }
 #navbar-body { 
   border-top: 1px solid #016799;
@@ -123,8 +123,8 @@
 
 
 #subnavbar { 
-  padding-top: 0px; 
-  font-size: 80%;
+  padding-top: 6px; 
+  font-size: 85%;
 }
 #subnavbar-body { 
   border-top: 1px solid #016799;
@@ -233,7 +233,7 @@
 
 
 div.subsite-context-bar {
-  font-size: 75%;
+  font-size: 85%;
   margin-bottom: 4px;
 }
 
@@ -271,3 +271,7 @@
   line-height:15px;
 }
 
+div.general-message {
+  background-color: #ccff99; 
+  padding: 4px;
+}
Index: openacs-4/packages/acs-subsite/www/user/basic-info-update.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/user/basic-info-update.adp,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/acs-subsite/www/user/basic-info-update.adp	18 Sep 2003 17:12:54 -0000	1.10
+++ openacs-4/packages/acs-subsite/www/user/basic-info-update.adp	22 Sep 2003 08:22:26 -0000	1.11
@@ -4,5 +4,9 @@
 
 <h2>#acs-subsite.Basic_Information#</h2>
 
-<include src="/packages/acs-subsite/lib/user-info" user_id="@user_id@" return_url="@return_url@" &="__adp_properties" edit_p="@edit_p@">
+<if @message@ not nil>
+  <div class="general-message">@message@</div>
+</if>
 
+<include src="/packages/acs-subsite/lib/user-info" user_id="@user_id@" return_url="@return_url@" &="__adp_properties" edit_p="@edit_p@" message="@message@">
+
Index: openacs-4/packages/acs-subsite/www/user/basic-info-update.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/user/basic-info-update.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/acs-subsite/www/user/basic-info-update.tcl	18 Sep 2003 17:12:54 -0000	1.7
+++ openacs-4/packages/acs-subsite/www/user/basic-info-update.tcl	22 Sep 2003 08:22:26 -0000	1.8
@@ -9,6 +9,7 @@
     {return_url ""}
     {user_id ""}
     {edit_p 0}
+    {message ""}
 }
 
 set page_title "Update Basic Information"
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.15 -r1.16
--- openacs-4/packages/acs-subsite/www/user/password-update.adp	4 Sep 2003 16:35:04 -0000	1.15
+++ openacs-4/packages/acs-subsite/www/user/password-update.adp	22 Sep 2003 08:22:26 -0000	1.16
@@ -3,4 +3,8 @@
   <property name="context">@context;noquote@</property>
   <property name="focus">@focus;noquote@</property>
 
+<if @message@ not nil>
+  <div class="general-message">@message@</div>
+</if>
+
 <formtemplate id="update"></formtemplate>
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.17 -r1.18
--- openacs-4/packages/acs-subsite/www/user/password-update.tcl	19 Sep 2003 13:57:47 -0000	1.17
+++ openacs-4/packages/acs-subsite/www/user/password-update.tcl	22 Sep 2003 08:22:26 -0000	1.18
@@ -7,6 +7,7 @@
     {user_id {[ad_conn untrusted_user_id]}}
     {return_url ""}
     {old_password ""}
+    {message ""}
 }
 # This is a bit confusing, but old_password is what we get passed in here,
 # whereas password_old is the form element.
@@ -58,6 +59,7 @@
     {user_id:integer(hidden)}
     {return_url:text(hidden),optional}
     {old_password:text(hidden),optional}
+    {message:text(hidden),optional}
 }
 
 if { [exists_and_not_null old_password] } {