diff --git a/scripts/database/pg/migrations/021.do.add-indexes.sql b/scripts/database/pg/migrations/021.do.add-indexes.sql
new file mode 100644
index 00000000..4e05e995
--- /dev/null
+++ b/scripts/database/pg/migrations/021.do.add-indexes.sql
@@ -0,0 +1,14 @@
+DO $$
+    BEGIN
+        BEGIN
+            CREATE INDEX users_lower_email ON sys_user(lower(email));
+        EXCEPTION WHEN OTHERS THEN
+           RAISE NOTICE 'problem creating index users_lower_email in sys_user.';
+        END;
+        BEGIN
+            CREATE INDEX users_username ON sys_user(username);
+        EXCEPTION WHEN OTHERS THEN
+            RAISE NOTICE 'problem creating index users_username in sys_user.';
+        END;
+    END;
+$$