diff --git a/app/Repositories/ToolRepository.php b/app/Repositories/ToolRepository.php
index d11ae85c..204063dd 100644
--- a/app/Repositories/ToolRepository.php
+++ b/app/Repositories/ToolRepository.php
@@ -368,10 +368,8 @@ class ToolRepository extends BaseRepository
     {
         $userInfo = get_user_row($uid);
         $prefix = "authority";
-        $excludes = collect(Setting::$permissionMustHaveClass)->map(fn ($p) => "$prefix.$p")->toArray();
         return Setting::query()
             ->where("name", "like", "$prefix.%")
-            ->whereNotIn('name', $excludes)
             ->where('value', '<=', $userInfo['class'])
             ->where('value', '>=', User::CLASS_PEASANT)
             ->pluck('name')
@@ -379,7 +377,6 @@ class ToolRepository extends BaseRepository
             ->toArray();
     }
 
-
     public static function listUserAllPermissions($uid): array
     {
         return NexusDB::remember("user_{$uid}_permissions", 600, function () use ($uid) {
diff --git a/public/modtask.php b/public/modtask.php
index 1289d932..836598c0 100644
--- a/public/modtask.php
+++ b/public/modtask.php
@@ -352,8 +352,7 @@ if ($action == "edituser")
     if (!empty($banLog)) {
         \App\Models\UserBanLog::query()->insert($banLog);
     }
-    \Nexus\Database\NexusDB::cache_del("user_{$userid}_content");
-    \Nexus\Database\NexusDB::cache_del('user_passkey_'.$userInfo->passkey.'_content');
+    clear_user_cache($userid, $userInfo->passkey);
 	$returnto = htmlspecialchars($_POST["returnto"]);
 	header("Location: " . get_protocol_prefix() . "$BASEURL/$returnto");
 	die;
diff --git a/public/takecontact.php b/public/takecontact.php
index 27806a73..b38e7ad3 100644
--- a/public/takecontact.php
+++ b/public/takecontact.php
@@ -35,6 +35,7 @@ sql_query("INSERT INTO staffmessages (sender, added, msg, subject) VALUES($useri
 sql_query("UPDATE users SET last_staffmsg = NOW() WHERE id = ".sqlesc($CURUSER['id'])) or sqlerr(__FILE__, __LINE__);
 $Cache->delete_value('staff_message_count');
 $Cache->delete_value('staff_new_message_count');
+clear_staff_message_cache();
 if ($_POST["returnto"])
 {
 	header("Location: " . htmlspecialchars($_POST["returnto"]));