diff --git a/app/config/auth.php b/app/config/auth.php
index 2330fe75cf..64d9e3ecd8 100644
--- a/app/config/auth.php
+++ b/app/config/auth.php
@@ -52,4 +52,11 @@ return [
         'docs' => 'https://appwrite.io/docs/references/cloud/client-web/account#accountCreatePhoneToken',
         'enabled' => true,
     ],
+    'webauthn' => [
+        'name' => 'Webauthn',
+        'key' => 'webauthn',
+        'icon' => '/images/users/webauthn.png',
+        'docs' => 'https://appwrite.io/docs/references/cloud/client-web/account#accountCreateWebAuthnSession',
+        'enabled' => true,
+    ]
 ];
diff --git a/app/config/collections.php b/app/config/collections.php
index 7829421bbf..95bb28b4bb 100644
--- a/app/config/collections.php
+++ b/app/config/collections.php
@@ -691,7 +691,14 @@ $commonCollections = [
                     'attributes' => ['userInternalId'],
                     'lengths' => [Database::LENGTH_KEY],
                     'orders' => [Database::ORDER_ASC],
-                ]
+                ],
+                [
+                    '$id' => ID::custom('_key_publicKeyCredentialId'),
+                    'type' => Database::INDEX_UNIQUE,
+                    'attributes' => ['publicKeyCredentialId'],
+                    'lengths' => [Database::LENGTH_KEY],
+                    'orders' => [Database::ORDER_ASC],
+                ],
         ],
     ],