diff --git a/setup/db/create-index-fk.sql b/setup/db/create-index-fk.sql
index 4d158b74a42..8a7e338961f 100644
--- a/setup/db/create-index-fk.sql
+++ b/setup/db/create-index-fk.sql
@@ -58,7 +58,6 @@ ALTER TABLE `cloud`.`op_vm_host` ADD CONSTRAINT `fk_op_vm_host__id` FOREIGN KEY
 
 ALTER TABLE `cloud`.`user` ADD INDEX `i_user__secret_key_removed`(`secret_key`, `removed`);
 ALTER TABLE `cloud`.`user` ADD INDEX `i_user__removed`(`removed`);
-ALTER TABLE `cloud`.`user` ADD UNIQUE `i_user__username__removed`(`username`, `removed`);
 ALTER TABLE `cloud`.`user` ADD UNIQUE `i_user__api_key`(`api_key`);
 ALTER TABLE `cloud`.`user` ADD CONSTRAINT `fk_user__account_id` FOREIGN KEY `fk_user__account_id` (`account_id`) REFERENCES `account` (`id`) ON DELETE CASCADE;
 ALTER TABLE `cloud`.`user` ADD INDEX `i_user__account_id`(`account_id`);
diff --git a/setup/db/db-migrate-2.1.3.sql b/setup/db/db-migrate-2.1.3.sql
new file mode 100644
index 00000000000..c3adf7b3d14
--- /dev/null
+++ b/setup/db/db-migrate-2.1.3.sql
@@ -0,0 +1,2 @@
+ALTER TABLE `cloud`.`user` DROP KEY `i_user__username__removed`;
+