diff --git a/admin/tool/dataprivacy/classes/external.php b/admin/tool/dataprivacy/classes/external.php
index 30d2e6dc0ac..1db296f2e26 100644
--- a/admin/tool/dataprivacy/classes/external.php
+++ b/admin/tool/dataprivacy/classes/external.php
@@ -107,7 +107,7 @@ class external extends external_api {
             $request = reset($requests);
             $datasubject = $request->get('userid');
 
-            if ($datasubject !== $USER->id) {
+            if ($datasubject !== (int) $USER->id) {
                 // The user is not the subject. Check that they can cancel this request.
                 if (!api::can_create_data_request_for_user($datasubject)) {
                     $forusercontext = \context_user::instance($datasubject);
diff --git a/admin/tool/dataprivacy/tests/expired_contexts_test.php b/admin/tool/dataprivacy/tests/expired_contexts_test.php
index 863cb827e56..5c22f8ef61a 100644
--- a/admin/tool/dataprivacy/tests/expired_contexts_test.php
+++ b/admin/tool/dataprivacy/tests/expired_contexts_test.php
@@ -713,7 +713,7 @@ class tool_dataprivacy_expired_contexts_testcase extends advanced_testcase {
 
         $unexpiredroles = $expiredrecord->get('unexpiredroles');
         $this->assertCount(1, $unexpiredroles);
-        $this->assertContains($role->id, $unexpiredroles);
+        $this->assertContainsEquals($role->id, $unexpiredroles);
     }
 
     /**
@@ -820,7 +820,7 @@ class tool_dataprivacy_expired_contexts_testcase extends advanced_testcase {
         // The teacher is not expired.
         $unexpiredroles = $expiredrecord->get('unexpiredroles');
         $this->assertCount(1, $unexpiredroles);
-        $this->assertContains($role->id, $unexpiredroles);
+        $this->assertContainsEquals($role->id, $unexpiredroles);
         $this->assertTrue((bool) $expiredrecord->get('defaultexpired'));
     }