diff --git a/templates/columns_definitions/column_attributes.twig b/templates/columns_definitions/column_attributes.twig
index 7e68d2de35..152bceeac1 100644
--- a/templates/columns_definitions/column_attributes.twig
+++ b/templates/columns_definitions/column_attributes.twig
@@ -33,17 +33,26 @@
   {% set ci = ci + 1 %}
 </td>
 <td class="text-center">
-    {# column default #}
-    {% include 'columns_definitions/column_default.twig' with {
-        'column_number': column_number,
-        'ci': ci,
-        'ci_offset': ci_offset,
-        'column_meta': column_meta,
-        'type_upper': type_upper,
-        'default_value': default_value,
-        'char_editing': char_editing
-    } only %}
-    {% set ci = ci + 1 %}
+  <select name="field_default_type[{{ column_number }}]" id="field_{{ column_number }}_{{ ci - ci_offset }}" class="default_type">
+    <option value="NONE"{{ column_meta['DefaultType'] is defined and column_meta['DefaultType'] == 'NONE' ? ' selected' }}>
+      {% trans %}None{% context %}for default{% endtrans %}
+    </option>
+    <option value="USER_DEFINED"{{ column_meta['DefaultType'] is defined and column_meta['DefaultType'] == 'USER_DEFINED' ? ' selected' }}>
+      {% trans 'As defined:' %}
+    </option>
+    <option value="NULL"{{ column_meta['DefaultType'] is defined and column_meta['DefaultType'] == 'NULL' ? ' selected' }}>
+      NULL
+    </option>
+    <option value="CURRENT_TIMESTAMP"{{ column_meta['DefaultType'] is defined and column_meta['DefaultType'] == 'CURRENT_TIMESTAMP' ? ' selected' }}>
+      CURRENT_TIMESTAMP
+    </option>
+  </select>
+  {% if char_editing == 'textarea' %}
+    <textarea name="field_default_value[{{ column_number }}]" cols="15" class="textfield default_value">{{ default_value }}</textarea>
+  {% else %}
+    <input type="text" name="field_default_value[{{ column_number }}]" size="12" value="{{ default_value }}" class="textfield default_value">
+  {% endif %}
+  {% set ci = ci + 1 %}
 </td>
 <td class="text-center">
   {# column collation #}
diff --git a/templates/columns_definitions/column_default.twig b/templates/columns_definitions/column_default.twig
deleted file mode 100644
index dcb66446bb..0000000000
--- a/templates/columns_definitions/column_default.twig
+++ /dev/null
@@ -1,35 +0,0 @@
-{# here we put 'NONE' as the default value of drop-down; otherwise users would
-have problems if they forget to enter the default value (example, for an INT) #}
-{% set translation %}{% trans %}None{% context %}for default{% endtrans %}{% endset %}
-{% set default_options = {
-    'NONE': translation,
-    'USER_DEFINED': 'As defined:'|trans,
-    'NULL': 'NULL',
-    'CURRENT_TIMESTAMP': 'CURRENT_TIMESTAMP'
-} %}
-
-<select name="field_default_type[{{ column_number }}]"
-    id="field_{{ column_number }}_{{ ci - ci_offset }}"
-    class="default_type">
-    {% for key, value in default_options %}
-        <option value="{{ key }}"
-            {%- if column_meta['DefaultType'] is defined
-                and column_meta['DefaultType'] == key %}
-                selected="selected"
-            {%- endif %}>
-            {{ value }}
-        </option>
-    {% endfor %}
-</select>
-{% if char_editing == 'textarea' %}
-    <textarea name="field_default_value[{{ column_number }}]"
-        cols="15"
-        class="textfield
-        default_value">{{ default_value }}</textarea>
-{% else %}
-    <input type="text"
-        name="field_default_value[{{ column_number }}]"
-        size="12"
-        value="{{ default_value }}"
-        class="textfield default_value">
-{% endif %}
diff --git a/templates/database/central_columns/edit_table_row.twig b/templates/database/central_columns/edit_table_row.twig
index 82731975d7..fead63ada3 100644
--- a/templates/database/central_columns/edit_table_row.twig
+++ b/templates/database/central_columns/edit_table_row.twig
@@ -25,15 +25,25 @@
   </td>
 
   <td class="nowrap" name="col_default">
-    {% include 'columns_definitions/column_default.twig' with {
-      'column_number': row_num,
-      'ci': 3,
-      'ci_offset': 0,
-      'column_meta': meta,
-      'type_upper': row['col_default']|upper,
-      'default_value': '',
-      'char_editing': char_editing
-    } only %}
+    <select name="field_default_type[{{ row_num }}]" id="field_{{ row_num }}_3" class="default_type">
+      <option value="NONE"{{ meta['DefaultType'] is defined and meta['DefaultType'] == 'NONE' ? ' selected' }}>
+        {% trans %}None{% context %}for default{% endtrans %}
+      </option>
+      <option value="USER_DEFINED"{{ meta['DefaultType'] is defined and meta['DefaultType'] == 'USER_DEFINED' ? ' selected' }}>
+        {% trans 'As defined:' %}
+      </option>
+      <option value="NULL"{{ meta['DefaultType'] is defined and meta['DefaultType'] == 'NULL' ? ' selected' }}>
+        NULL
+      </option>
+      <option value="CURRENT_TIMESTAMP"{{ meta['DefaultType'] is defined and meta['DefaultType'] == 'CURRENT_TIMESTAMP' ? ' selected' }}>
+        CURRENT_TIMESTAMP
+      </option>
+    </select>
+    {% if char_editing == 'textarea' %}
+      <textarea name="field_default_value[{{ row_num }}]" cols="15" class="textfield default_value"></textarea>
+    {% else %}
+      <input type="text" name="field_default_value[{{ row_num }}]" size="12" value="" class="textfield default_value">
+    {% endif %}
   </td>
 
   <td name="collation" class="nowrap">
diff --git a/templates/database/central_columns/main.twig b/templates/database/central_columns/main.twig
index f2495091e2..e72a636670 100644
--- a/templates/database/central_columns/main.twig
+++ b/templates/database/central_columns/main.twig
@@ -74,14 +74,17 @@
                           </p>
                         </td>
                         <td class="nowrap" name="col_default">
-                            {% include 'columns_definitions/column_default.twig' with {
-                                'column_number': 0,
-                                'ci': 3,
-                                'ci_offset': 0,
-                                'type_upper': '',
-                                'column_meta': {},
-                                'char_editing': char_editing,
-                            } only %}
+                          <select name="field_default_type[0]" id="field_0_3" class="default_type">
+                            <option value="NONE">{% trans %}None{% context %}for default{% endtrans %}</option>
+                            <option value="USER_DEFINED">{% trans 'As defined:' %}</option>
+                            <option value="NULL">NULL</option>
+                            <option value="CURRENT_TIMESTAMP">CURRENT_TIMESTAMP</option>
+                          </select>
+                          {% if char_editing == 'textarea' %}
+                            <textarea name="field_default_value[0]" cols="15" class="textfield default_value"></textarea>
+                          {% else %}
+                            <input type="text" name="field_default_value[0]" size="12" value="" class="textfield default_value">
+                          {% endif %}
                         </td>
                         <td name="collation" class="nowrap">
                           <select lang="en" dir="ltr" name="field_collation[0]" id="field_0_4">
@@ -305,19 +308,30 @@
                               </p>
                             </td>
                             <td class="nowrap" name="col_default">
-                                {% if row['col_default'] is defined %}
-                                    <span>{{ row['col_default'] }}</span>
-                                {% else %}
-                                    <span>None</span>
-                                {% endif %}
-                                {% include 'columns_definitions/column_default.twig' with {
-                                    'column_number': row_num,
-                                    'ci': 3,
-                                    'ci_offset': 0,
-                                    'type_upper': types_upper[row_num],
-                                    'column_meta': rows_meta[row_num],
-                                    'char_editing': char_editing,
-                                } only %}
+                              {% if row['col_default'] is defined %}
+                                <span>{{ row['col_default'] }}</span>
+                              {% else %}
+                                <span>{% trans 'None' %}</span>
+                              {% endif %}
+                              <select name="field_default_type[{{ row_num }}]" id="field_{{ row_num }}_3" class="default_type">
+                                <option value="NONE"{{ rows_meta[row_num]['DefaultType'] is defined and rows_meta[row_num]['DefaultType'] == 'NONE' ? ' selected' }}>
+                                  {% trans %}None{% context %}for default{% endtrans %}
+                                </option>
+                                <option value="USER_DEFINED"{{ rows_meta[row_num]['DefaultType'] is defined and rows_meta[row_num]['DefaultType'] == 'USER_DEFINED' ? ' selected' }}>
+                                  {% trans 'As defined:' %}
+                                </option>
+                                <option value="NULL"{{ rows_meta[row_num]['DefaultType'] is defined and rows_meta[row_num]['DefaultType'] == 'NULL' ? ' selected' }}>
+                                  NULL
+                                </option>
+                                <option value="CURRENT_TIMESTAMP"{{ rows_meta[row_num]['DefaultType'] is defined and rows_meta[row_num]['DefaultType'] == 'CURRENT_TIMESTAMP' ? ' selected' }}>
+                                  CURRENT_TIMESTAMP
+                                </option>
+                              </select>
+                              {% if char_editing == 'textarea' %}
+                                <textarea name="field_default_value[{{ row_num }}]" cols="15" class="textfield default_value"></textarea>
+                              {% else %}
+                                <input type="text" name="field_default_value[{{ row_num }}]" size="12" value="" class="textfield default_value">
+                              {% endif %}
                             </td>
                             <td name="collation" class="nowrap">
                                 <span>{{ row['col_collation'] }}</span>