diff --git a/phpBB/phpbb/db/migration/data/v32x/user_notifications_table_reduce_column_sizes.php b/phpBB/phpbb/db/migration/data/v32x/user_notifications_table_reduce_column_sizes.php
index c2efb8fd4f..e0a107782e 100644
--- a/phpBB/phpbb/db/migration/data/v32x/user_notifications_table_reduce_column_sizes.php
+++ b/phpBB/phpbb/db/migration/data/v32x/user_notifications_table_reduce_column_sizes.php
@@ -18,7 +18,7 @@ class user_notifications_table_reduce_column_sizes extends \phpbb\db\migration\m
 	static public function depends_on()
 	{
 		return array(
-			'\phpbb\db\migration\data\v32x\user_notifications_table_remove_duplicates',
+			'\phpbb\db\migration\data\v32x\user_notifications_table_index_p3',
 		);
 	}
 
diff --git a/phpBB/phpbb/db/migration/data/v32x/user_notifications_table_remove_duplicates.php b/phpBB/phpbb/db/migration/data/v32x/user_notifications_table_remove_duplicates.php
index 371cdf9b3a..50d0642056 100644
--- a/phpBB/phpbb/db/migration/data/v32x/user_notifications_table_remove_duplicates.php
+++ b/phpBB/phpbb/db/migration/data/v32x/user_notifications_table_remove_duplicates.php
@@ -18,7 +18,7 @@ class user_notifications_table_remove_duplicates extends \phpbb\db\migration\mig
 	static public function depends_on()
 	{
 		return array(
-			'\phpbb\db\migration\data\v32x\user_notifications_table_index_p3',
+			'\phpbb\db\migration\data\v32x\user_notifications_table_temp_index',
 		);
 	}
 
diff --git a/phpBB/phpbb/db/migration/data/v32x/user_notifications_table_temp_index.php b/phpBB/phpbb/db/migration/data/v32x/user_notifications_table_temp_index.php
new file mode 100644
index 0000000000..80256a0e0a
--- /dev/null
+++ b/phpBB/phpbb/db/migration/data/v32x/user_notifications_table_temp_index.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ *
+ * This file is part of the phpBB Forum Software package.
+ *
+ * @copyright (c) phpBB Limited <https://www.phpbb.com>
+ * @license GNU General Public License, version 2 (GPL-2.0)
+ *
+ * For full copyright and license information, please see
+ * the docs/CREDITS.txt file.
+ *
+ */
+
+namespace phpbb\db\migration\data\v32x;
+
+class user_notifications_table_temp_index extends \phpbb\db\migration\migration
+{
+	static public function depends_on()
+	{
+		return array(
+			'\phpbb\db\migration\data\v32x\user_notifications_table_reduce_column_sizes',
+		);
+	}
+
+	public function update_schema()
+	{
+		return array(
+			'add_index' => array(
+				$this->table_prefix . 'user_notifications' => array(
+					'itm_usr_mthd'	=> array('item_type', 'item_id', 'user_id', 'method'),
+				),
+			),
+		);
+	}
+
+	public function revert_schema()
+	{
+		return array(
+			'drop_keys' => array(
+				$this->table_prefix . 'user_notifications' => array(
+					'itm_usr_mthd',
+				),
+			),
+		);
+	}
+}
diff --git a/phpBB/phpbb/db/migration/data/v32x/user_notifications_table_unique_index.php b/phpBB/phpbb/db/migration/data/v32x/user_notifications_table_unique_index.php
index e46c231b7b..51cf90c8a0 100644
--- a/phpBB/phpbb/db/migration/data/v32x/user_notifications_table_unique_index.php
+++ b/phpBB/phpbb/db/migration/data/v32x/user_notifications_table_unique_index.php
@@ -18,13 +18,18 @@ class user_notifications_table_unique_index extends \phpbb\db\migration\migratio
 	static public function depends_on()
 	{
 		return array(
-			'\phpbb\db\migration\data\v32x\user_notifications_table_reduce_column_sizes',
+			'\phpbb\db\migration\data\v32x\user_notifications_table_remove_duplicates',
 		);
 	}
 
 	public function update_schema()
 	{
 		return array(
+			'drop_keys'			=> array(
+				$this->table_prefix . 'user_notifications' => array(
+					'itm_usr_mthd',
+				),
+			),
 			'add_unique_index'  => array(
 				$this->table_prefix . 'user_notifications' => array(
 					'itm_usr_mthd'	=> array('item_type', 'item_id', 'user_id', 'method'),