diff --git a/Oqtane.Server/Extensions/OqtaneServiceCollectionExtensions.cs b/Oqtane.Server/Extensions/OqtaneServiceCollectionExtensions.cs
index 115abee0..20f3bef9 100644
--- a/Oqtane.Server/Extensions/OqtaneServiceCollectionExtensions.cs
+++ b/Oqtane.Server/Extensions/OqtaneServiceCollectionExtensions.cs
@@ -366,6 +366,9 @@ namespace Microsoft.Extensions.DependencyInjection
                 // User settings
                 options.User.RequireUniqueEmail = false;
                 options.User.AllowedUserNameCharacters = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._@+";
+
+                // Stores settings
+                options.Stores.SchemaVersion = IdentitySchemaVersions.Version3;
             });
 
             // overrides defined in appsettings
diff --git a/Oqtane.Server/Migrations/Tenant/10000001_AddAspNetUserPasskeys.cs b/Oqtane.Server/Migrations/Tenant/10000001_AddAspNetUserPasskeys.cs
index bb184b86..3ed8dfcd 100644
--- a/Oqtane.Server/Migrations/Tenant/10000001_AddAspNetUserPasskeys.cs
+++ b/Oqtane.Server/Migrations/Tenant/10000001_AddAspNetUserPasskeys.cs
@@ -18,6 +18,7 @@ namespace Oqtane.Migrations.Tenant
         {
             var aspNetUserPasskeysEntityBuilder = new AspNetUserPasskeysEntityBuilder(migrationBuilder, ActiveDatabase);
             aspNetUserPasskeysEntityBuilder.Create();
+            aspNetUserPasskeysEntityBuilder.AddIndex("IX_AspNetUserPasskeys_UserId", "UserId");
         }
 
         protected override void Down(MigrationBuilder migrationBuilder)