diff --git a/phpBB/install/schemas/mysql_schema.sql b/phpBB/install/schemas/mysql_schema.sql
index 8ac0cae222..4073ba2902 100644
--- a/phpBB/install/schemas/mysql_schema.sql
+++ b/phpBB/install/schemas/mysql_schema.sql
@@ -464,7 +464,6 @@ CREATE TABLE phpbb_styles (
    theme_id tinyint(4) UNSIGNED NOT NULL,
    imageset_id tinyint(4) UNSIGNED NOT NULL,
    style_name char(30) NOT NULL,
-   bbcode_bitfield int(11) UNSIGNED DEFAULT '0' NOT NULL,
    PRIMARY KEY (style_id),
    KEY (template_id),
    KEY (theme_id),
@@ -477,7 +476,8 @@ CREATE TABLE phpbb_styles_template (
    template_name varchar(30) NOT NULL,
    template_path varchar(50) NOT NULL,
    poll_length smallint(5) UNSIGNED NOT NULL, 
-   pm_box_length smallint(5) UNSIGNED NOT NULL, 
+   pm_box_length smallint(5) UNSIGNED NOT NULL,
+   bbcode_bitfield int(11) UNSIGNED DEFAULT '0' NOT NULL, 
    PRIMARY KEY (template_id)
 );
 
diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql
index 5d3a11601f..84cb791f5c 100644
--- a/phpBB/install/schemas/schema_data.sql
+++ b/phpBB/install/schemas/schema_data.sql
@@ -241,7 +241,7 @@ INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('u_search', 1);
 # MSSQL IDENTITY phpbb_styles ON #
 
 # -- phpbb_styles
-INSERT INTO phpbb_styles (style_id, template_id, theme_id, imageset_id, style_name, bbcode_bitfield) VALUES (1, 1, 1, 1, 'subSilver', 2817);
+INSERT INTO phpbb_styles (style_id, template_id, theme_id, imageset_id, style_name) VALUES (1, 1, 1, 1, 'subSilver');
 
 # MSSQL IDENTITY phpbb_styles OFF #
 
@@ -257,7 +257,7 @@ INSERT INTO phpbb_styles_imageset (imageset_id, imageset_name, imageset_path, bt
 # MSSQL IDENTITY phpbb_styles_template ON #
 
 # -- phpbb_styles_template
-INSERT INTO phpbb_styles_template (template_id, template_name, template_path, poll_length, pm_box_length) VALUES (1, 'subSilver © phpBB Group', 'subSilver', 205, 175);
+INSERT INTO phpbb_styles_template (template_id, template_name, template_path, poll_length, pm_box_length, bbcode_bitfield) VALUES (1, 'subSilver © phpBB Group', 'subSilver', 205, 175, 2817);
 
 # MSSQL IDENTITY phpbb_styles_template OFF #