Index: openacs-4/packages/dotlrn/www/admin/password-update.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/password-update.tcl,v
diff -u -r1.2.6.2 -r1.2.6.3
--- openacs-4/packages/dotlrn/www/admin/password-update.tcl	7 Oct 2004 01:21:40 -0000	1.2.6.2
+++ openacs-4/packages/dotlrn/www/admin/password-update.tcl	17 Aug 2005 21:29:25 -0000	1.2.6.3
@@ -7,7 +7,13 @@
     {user_id:integer}
     {return_url ""}
     {password_old ""}
-} 
+}  -validate {
+    dotlrn_cannot_become_wide_admin {
+	if { [acs_user::site_wide_admin_p -user_id $user_id] && ![acs_user::site_wide_admin_p] } {
+	    ad_complain "[_ acs-admin.lt_You_dont_have_permiss]"
+	}
+    }
+}
 
 #Pages in this directory are only runnable by dotlrn-wide admins.
 dotlrn::require_admin 
Index: openacs-4/packages/dotlrn/www/admin/site-wide-admin-toggle.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/site-wide-admin-toggle.tcl,v
diff -u -r1.8.6.2 -r1.8.6.3
--- openacs-4/packages/dotlrn/www/admin/site-wide-admin-toggle.tcl	25 Aug 2004 15:50:58 -0000	1.8.6.2
+++ openacs-4/packages/dotlrn/www/admin/site-wide-admin-toggle.tcl	17 Aug 2005 21:29:25 -0000	1.8.6.3
@@ -34,8 +34,9 @@
         ad_return_forbidden \
                "Permission Denied" \
                "<blockquote>
-                You don't have permission to see this page.
+	            [_ acs-admin.lt_You_dont_have_permiss]
                </blockquote>"
+	return
 }
 
 if {[string equal $value "grant"] == 1} {
Index: openacs-4/packages/dotlrn/www/admin/user.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/user.adp,v
diff -u -r1.25.2.2.4.7 -r1.25.2.2.4.8
--- openacs-4/packages/dotlrn/www/admin/user.adp	13 Oct 2004 19:27:46 -0000	1.25.2.2.4.7
+++ openacs-4/packages/dotlrn/www/admin/user.adp	17 Aug 2005 21:29:25 -0000	1.25.2.2.4.8
@@ -187,14 +187,16 @@
 </p>
 </else>
 
+<if @portrait_p@ true or @administrative_action_p@ true>
 <h3>#dotlrn.lt_Administrative_Action#</h3>
 
 <ul>
-  <li><a href="password-update?@export_edit_vars@">#dotlrn.lt_Update_this_users_pas#</a></li>
   <if @portrait_p@>
     <li><a href="/user/portrait/index.tcl?@export_edit_vars@">#dotlrn.lt_Manage_this_users_por#</a></li>
   </if>
- <if @oacs_site_wide_admin_p@ true or @dotlrn_admin_p@ true>
-  <li><a href="become?user_id=@user_id@">#dotlrn.Become_this_user#</a></li>
- </if> 
+  <if @administrative_action_p@>
+    <li><a href="password-update?@export_edit_vars@">#dotlrn.lt_Update_this_users_pas#</a></li>
+    <li><a href="become?user_id=@user_id@">#dotlrn.Become_this_user#</a></li>
+  </if>
 </ul>
+</if>
Index: openacs-4/packages/dotlrn/www/admin/user.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/user.tcl,v
diff -u -r1.16.6.5 -r1.16.6.6
--- openacs-4/packages/dotlrn/www/admin/user.tcl	13 Oct 2004 19:27:46 -0000	1.16.6.5
+++ openacs-4/packages/dotlrn/www/admin/user.tcl	17 Aug 2005 21:29:25 -0000	1.16.6.6
@@ -95,6 +95,11 @@
 
 set dotlrn_admin_p [dotlrn::admin_p]
 
+set administrative_action_p 0
+if { ($oacs_site_wide_admin_p && $site_wide_admin_p) || (!$site_wide_admin_p && ($oacs_site_wide_admin_p || $dotlrn_admin_p))} {
+	set administrative_action_p 1
+}
+
 set context_bar [list [list users [_ dotlrn.Users]] "$first_names $last_name"]
 
 set dual_approve_return_url [ns_urlencode [dotlrn::get_admin_url]/user-new-2?user_id=$user_id&referer=$return_url]