diff --git a/app/controllers/api/users.php b/app/controllers/api/users.php
index 275ea334e3..117338b9a7 100644
--- a/app/controllers/api/users.php
+++ b/app/controllers/api/users.php
@@ -108,6 +108,8 @@ function createUser(string $hash, mixed $hashOptions, string $userId, ?string $e
             $hooks->trigger('passwordValidator', [$dbForProject, $project, $plaintextPassword, &$user, true]);
         }
 
+        $user = $dbForProject->createDocument('users', $user);
+
         if ($email) {
             try {
                 $target = $dbForProject->createDocument('targets', new Document([
@@ -143,8 +145,6 @@ function createUser(string $hash, mixed $hashOptions, string $userId, ?string $e
         }
 
         $dbForProject->deleteCachedDocument('users', $user->getId());
-
-        $user = $dbForProject->createDocument('users', $user);
     } catch (Duplicate $th) {
         throw new Exception(Exception::USER_ALREADY_EXISTS);
     }
diff --git a/phpunit.xml b/phpunit.xml
index 90ebd4225f..e772866051 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -6,7 +6,7 @@
          convertNoticesToExceptions="true"
          convertWarningsToExceptions="true"
          processIsolation="false"
-         stopOnFailure="false"
+         stopOnFailure="true"
 >
     <extensions>
         <extension class="Appwrite\Tests\TestHook" />
diff --git a/tests/e2e/Services/Messaging/MessagingBase.php b/tests/e2e/Services/Messaging/MessagingBase.php
index d6c4b59ce3..1a16674658 100644
--- a/tests/e2e/Services/Messaging/MessagingBase.php
+++ b/tests/e2e/Services/Messaging/MessagingBase.php
@@ -634,7 +634,7 @@ trait MessagingBase
         $this->assertEquals(201, $response['headers']['status-code'], "Error creating user: " . var_export($response['body'], true));
 
         $user = $response['body'];
-
+        var_dump($user);
         $this->assertEquals(1, \count($user['targets']));
         $targetId = $user['targets'][0]['$id'];