diff --git a/app/controllers/api/account.php b/app/controllers/api/account.php
index 94dff149f3..88c1b18a3c 100644
--- a/app/controllers/api/account.php
+++ b/app/controllers/api/account.php
@@ -103,7 +103,7 @@ App::post('/v1/account')
                 'phone' => $phone,
                 'phoneVerification' => false,
                 'status' => true,
-                'password' => Auth::passwordHash($password, Auth::DEFAULT_ALGO, Auth::DEFAULT_ALGO_OPTIONS),
+                'password' => (!empty($password)) ? Auth::passwordHash($password, Auth::DEFAULT_ALGO, Auth::DEFAULT_ALGO_OPTIONS) : '',
                 'hash' => Auth::DEFAULT_ALGO,
                 'hashOptions' => Auth::DEFAULT_ALGO_OPTIONS,
                 'passwordUpdate' => \time(),
diff --git a/tests/unit/Auth/AuthTest.php b/tests/unit/Auth/AuthTest.php
index 6665d60b55..0c6d99b15a 100644
--- a/tests/unit/Auth/AuthTest.php
+++ b/tests/unit/Auth/AuthTest.php
@@ -191,7 +191,7 @@ class AuthTest extends TestCase
 
     public function testCodeGenerator(): void
     {
-        $this->assertCount(6, \strlen(Auth::codeGenerator()));
+        $this->assertEquals(6, \strlen(Auth::codeGenerator()));
         $this->assertEquals(\mb_strlen(Auth::codeGenerator()), 256);
         $this->assertEquals(\mb_strlen(Auth::codeGenerator(5)), 10);
         $this->assertTrue(is_numeric(Auth::codeGenerator(5)));