diff --git a/phpBB/includes/db/db_tools.php b/phpBB/includes/db/db_tools.php
index 3a7ea2f945..8372f90369 100644
--- a/phpBB/includes/db/db_tools.php
+++ b/phpBB/includes/db/db_tools.php
@@ -468,6 +468,15 @@ class phpbb_db_tools
 			break;
 		}
 
+		if ($this->sql_layer == 'mssql' || $this->sql_layer == 'mssqlnative')
+		{
+			if (!isset($table_data['PRIMARY_KEY']))
+			{
+				$table_data['COLUMNS']['mssqlindex'] = array('UINT', NULL, 'auto_increment');
+				$table_data['PRIMARY_KEY'] = 'mssqlindex';
+			}
+		}
+
 		// Iterate through the columns to create a table
 		foreach ($table_data['COLUMNS'] as $column_name => $column_data)
 		{
@@ -523,15 +532,6 @@ class phpbb_db_tools
 		// this means that we can add the one we really wanted instead
 		if (!$primary_key_gen)
 		{
-			if ($this->sql_layer == 'mssql' || $this->sql_layer == 'mssqlnative')
-			{
-				if (!isset($table_data['PRIMARY_KEY']))
-				{
-					$table_data['COLUMNS']['mssqlindex'] = array('UINT', NULL, 'auto_increment');
-					$table_data['PRIMARY_KEY'] = 'mssqlindex';
-				}
-			}
-
 			// Write primary key
 			if (isset($table_data['PRIMARY_KEY']))
 			{