diff --git a/phpBB/includes/db/db_tools.php b/phpBB/includes/db/db_tools.php
index 0518b7eb29..3a7ea2f945 100644
--- a/phpBB/includes/db/db_tools.php
+++ b/phpBB/includes/db/db_tools.php
@@ -523,6 +523,15 @@ 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']))
 			{