diff --git a/templates/columns_definitions/column_extra.twig b/templates/columns_definitions/column_extra.twig
deleted file mode 100644
index 7f61f5cb98..0000000000
--- a/templates/columns_definitions/column_extra.twig
+++ /dev/null
@@ -1,7 +0,0 @@
-<input name="col_extra[{{ column_number }}]"
-    id="field_{{ column_number }}_{{ ci - ci_offset }}"
-    {% if column_meta['Extra'] is not empty and column_meta['Extra'] == 'auto_increment' -%}
-        checked="checked"
-    {%- endif %}
-    type="checkbox"
-    value="auto_increment">
diff --git a/templates/database/central_columns/edit_table_row.twig b/templates/database/central_columns/edit_table_row.twig
index fead63ada3..81e333cabe 100644
--- a/templates/database/central_columns/edit_table_row.twig
+++ b/templates/database/central_columns/edit_table_row.twig
@@ -79,11 +79,7 @@
   </td>
 
   <td class="nowrap" name="col_extra">
-    {% include 'columns_definitions/column_extra.twig' with {
-      'column_number': row_num,
-      'ci': 7,
-      'ci_offset': 0,
-      'column_meta': {'Extra': row['col_extra']}
-    } only %}
+    <input name="col_extra[{{ row_num }}]" id="field_{{ row_num }}_7" type="checkbox" value="auto_increment"
+      {{- row['col_extra'] is not empty and row['col_extra'] == 'auto_increment' }}>
   </td>
 </tr>
diff --git a/templates/database/central_columns/main.twig b/templates/database/central_columns/main.twig
index e72a636670..02fc512ab8 100644
--- a/templates/database/central_columns/main.twig
+++ b/templates/database/central_columns/main.twig
@@ -115,12 +115,7 @@
                           <input name="field_null[0]" id="field_0_6" type="checkbox" value="YES" class="allow_null">
                         </td>
                         <td class="nowrap" name="col_extra">
-                            {% include 'columns_definitions/column_extra.twig' with {
-                                'column_number': 0,
-                                'ci': 7,
-                                'ci_offset': 0,
-                                'column_meta': {}
-                            } only %}
+                          <input name="col_extra[0]" id="field_0_7" type="checkbox" value="auto_increment">
                         </td>
                         <td>
                             <input id="add_column_save" class="btn btn-primary" type="submit" value="Save">
@@ -367,15 +362,9 @@
                                   {{- row['col_isNull'] is not empty and row['col_isNull'] != 'NO' and row['col_isNull'] != 'NOT NULL' ? ' checked' }}>
                             </td>
                             <td class="nowrap" name="col_extra">
-                                <span>{{ row['col_extra'] }}</span>
-                                {% include 'columns_definitions/column_extra.twig' with {
-                                    'column_number': row_num,
-                                    'ci': 7,
-                                    'ci_offset': 0,
-                                    'column_meta': {
-                                        'Extra': row['col_extra']
-                                    }
-                                } only %}
+                              <span>{{ row['col_extra'] }}</span>
+                              <input name="col_extra[{{ row_num }}]" id="field_{{ row_num }}_7" type="checkbox" value="auto_increment"
+                                {{- row['col_extra'] is not empty and row['col_extra'] == 'auto_increment' ? ' checked' }}>
                             </td>
                         </tr>
                         {% set row_num = row_num + 1 %}