6 files changed, 5 insertions, 19 deletions
diff --git a/actions/admin/user/ban.php b/actions/admin/user/ban.php
index 5ad6c29c5..209ece2a0 100644
--- a/actions/admin/user/ban.php
+++ b/actions/admin/user/ban.php
@@ -9,12 +9,10 @@
  * @subpackage Administration.User
  */
 
-admin_gatekeeper();
-
 $guid = get_input('guid');
 $user = get_entity($guid);
 
-if ($guid == get_loggedin_userid()) {
+if ($guid == elgg_get_logged_in_user_guid()) {
 	register_error(elgg_echo('admin:user:self:ban:no'));
 	forward(REFERER);
 }
diff --git a/actions/admin/user/delete.php b/actions/admin/user/delete.php
index a5e1886ec..7cfbd0925 100644
--- a/actions/admin/user/delete.php
+++ b/actions/admin/user/delete.php
@@ -9,15 +9,11 @@
  * @subpackage Administration.User
  */
 
-// block non-admin users - require since this action is not registered
-// @todo why isn't this action registered?
-admin_gatekeeper();
-
 // Get the user
 $guid = get_input('guid');
 $user = get_entity($guid);
 
-if ($guid == get_loggedin_userid()) {
+if ($guid == elgg_get_logged_in_user_guid()) {
 	register_error(elgg_echo('admin:user:self:delete:no'));
 	forward(REFERER);
 }
@@ -38,7 +34,7 @@ if (($user instanceof ElggUser) && ($user->canEdit())) {
 // forward to user administration if on a user's page as it no longer exists
 $forward = REFERER;
 if (strpos($_SERVER['HTTP_REFERER'], $username) != FALSE) {
-	$forward = "pg/admin/user/";
+	$forward = "admin/users/newest";
 }
 
 forward($forward);
diff --git a/actions/admin/user/makeadmin.php b/actions/admin/user/makeadmin.php
index 19f365d62..54b0b7070 100644
--- a/actions/admin/user/makeadmin.php
+++ b/actions/admin/user/makeadmin.php
@@ -11,8 +11,6 @@
  * @subpackage Administration.User
  */
 
-admin_gatekeeper();
-
 $guid = get_input('guid');
 $user = get_entity($guid);
 
diff --git a/actions/admin/user/removeadmin.php b/actions/admin/user/removeadmin.php
index 97bfc396b..8cebc7078 100644
--- a/actions/admin/user/removeadmin.php
+++ b/actions/admin/user/removeadmin.php
@@ -6,12 +6,10 @@
  * @subpackage Administration.User
  */
 
-admin_gatekeeper();
-
 $guid = get_input('guid');
 $user = get_entity($guid);
 
-if ($guid == get_loggedin_userid()) {
+if ($guid == elgg_get_logged_in_user_guid()) {
 	register_error(elgg_echo('admin:user:self:removeadmin:no'));
 	forward(REFERER);
 }
diff --git a/actions/admin/user/resetpassword.php b/actions/admin/user/resetpassword.php
index 14de69cb6..d019a7f55 100644
--- a/actions/admin/user/resetpassword.php
+++ b/actions/admin/user/resetpassword.php
@@ -14,8 +14,6 @@
  * @subpackage Administration.User
  */
 
-admin_gatekeeper();
-
 $guid = get_input('guid');
 $user = get_entity($guid);
 
@@ -30,7 +28,7 @@ if (($user instanceof ElggUser) && ($user->canEdit())) {
 		system_message(elgg_echo('admin:user:resetpassword:yes'));
 
 		notify_user($user->guid,
-			$CONFIG->site->guid,
+			elgg_get_site_entity()->guid,
 			elgg_echo('email:resetpassword:subject'),
 			elgg_echo('email:resetpassword:body', array($user->username, $password)),
 			NULL,
diff --git a/actions/admin/user/unban.php b/actions/admin/user/unban.php
index 883e074ed..7a772a0d3 100644
--- a/actions/admin/user/unban.php
+++ b/actions/admin/user/unban.php
@@ -6,8 +6,6 @@
  * @subpackage Administration.User
  */
 
-admin_gatekeeper();
-
 $access_status = access_get_show_hidden_status();
 access_show_hidden_entities(true);