diff --git a/Oqtane.Server/Migrations/Tenant/06010401_RemoveUniqueEmailIndex.cs b/Oqtane.Server/Migrations/Tenant/06010401_RemoveUniqueEmailIndex.cs
new file mode 100644
index 00000000..ac783753
--- /dev/null
+++ b/Oqtane.Server/Migrations/Tenant/06010401_RemoveUniqueEmailIndex.cs
@@ -0,0 +1,30 @@
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Oqtane.Databases.Interfaces;
+using Oqtane.Migrations.EntityBuilders;
+using Oqtane.Repository;
+
+namespace Oqtane.Migrations.Tenant
+{
+    [DbContext(typeof(TenantDBContext))]
+    [Migration("Tenant.06.01.04.01")]
+    public class RemoveUniqueEmailIndex : MultiDatabaseMigration
+    {
+        public RemoveUniqueEmailIndex(IDatabase database) : base(database)
+        {
+        }
+
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            // framework uses RequireUniqueEmail = False in .NET Identity configuration
+            var aspNetUsersEntityBuilder = new AspNetUsersEntityBuilder(migrationBuilder, ActiveDatabase);
+            aspNetUsersEntityBuilder.DropIndex("EmailIndex");
+            aspNetUsersEntityBuilder.AddIndex("EmailIndex", "NormalizedEmail", false);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            // not implemented
+        }
+    }
+}