diff --git a/app/Models/User.php b/app/Models/User.php
index a0727f831..7ce38f69a 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -96,17 +96,17 @@ use Spatie\Permission\Traits\HasRoles;
  * @method static Builder|User whereUsername($value)
  * @method static Builder|User whereUuid($value)
  */
-class User extends Model implements AuthenticatableContract, AuthorizableContract, CanResetPasswordContract, FilamentUser, HasAppAuthentication, HasAppAuthenticationRecovery, HasAvatar, HasEmailAuthentication, HasName, HasTenants, Validatable, HasPasskeys
+class User extends Model implements AuthenticatableContract, AuthorizableContract, CanResetPasswordContract, FilamentUser, HasAppAuthentication, HasAppAuthenticationRecovery, HasAvatar, HasEmailAuthentication, HasName, HasPasskeys, HasTenants, Validatable
 {
     use Authenticatable;
     use Authorizable { can as protected canned; }
     use CanResetPassword;
     use HasAccessTokens;
     use HasFactory;
+    use HasFactory, InteractsWithPasskeys, Notifiable;
     use HasRoles;
     use HasValidation { getRules as getValidationRules; }
     use Notifiable;
-    use HasFactory, Notifiable, InteractsWithPasskeys;
 
     public const USER_LEVEL_USER = 0;
 
@@ -513,7 +513,7 @@ class User extends Model implements AuthenticatableContract, AuthorizableContrac
         return $this->username ?? $this->email;
     }
 
-    public function getPasskeyUserId(): string
+    public function getPasskeyUserId(): int
     {
         return $this->id;
     }
diff --git a/database/migrations/2026_02_07_103629_create_passkeys_table.php b/database/migrations/2026_02_07_103629_create_passkeys_table.php
index 9d1924aac..652244b2e 100644
--- a/database/migrations/2026_02_07_103629_create_passkeys_table.php
+++ b/database/migrations/2026_02_07_103629_create_passkeys_table.php
@@ -11,9 +11,9 @@ return new class extends Migration
     {
         $authenticatableClass = Config::getAuthenticatableModel();
 
-        $authenticatableTableName = (new $authenticatableClass)->getTable();
+        $authenticatableTableName = (new $authenticatableClass())->getTable();
 
-        Schema::create('passkeys', function (Blueprint $table) use ($authenticatableTableName,$authenticatableClass) {
+        Schema::create('passkeys', function (Blueprint $table) use ($authenticatableTableName) {
             $table->id();
 
             $table