diff --git a/app/init/resources.php b/app/init/resources.php
index b2d9b30644..c47e4226e9 100644
--- a/app/init/resources.php
+++ b/app/init/resources.php
@@ -672,10 +672,11 @@ Http::setResource('dbForProject', function (Group $pools, Database $dbForPlatfor
         ->addHook(new UserEvents(
             $project,
             $response,
-            $queueForEventsClone->from($queueForEvents),
-            $queueForFunctions->from($queueForEvents),
-            $queueForWebhooks->from($queueForEvents),
-            $queueForRealtime->from($queueForEvents),
+            $queueForEvents,
+            $queueForEventsClone,
+            $queueForFunctions,
+            $queueForWebhooks,
+            $queueForRealtime,
         ))
         ->addHook(new FunctionCache($project, $database))
         ->addHook(new Permissions());
diff --git a/src/Appwrite/Utopia/Database/Hooks/UserEvents.php b/src/Appwrite/Utopia/Database/Hooks/UserEvents.php
index a3eec08ca0..79f0d90bb9 100644
--- a/src/Appwrite/Utopia/Database/Hooks/UserEvents.php
+++ b/src/Appwrite/Utopia/Database/Hooks/UserEvents.php
@@ -21,6 +21,7 @@ class UserEvents implements Lifecycle
     public function __construct(
         private Document $project,
         private Response $response,
+        private Event $source,
         private Event $events,
         private Func $functions,
         private Webhook $webhooks,
@@ -39,6 +40,7 @@ class UserEvents implements Lifecycle
         }
 
         $this->events
+            ->from($this->source)
             ->setProject($this->project)
             ->setEvent('users.[userId].create')
             ->setParam('userId', $data->getId())