diff --git a/ChangeLog b/ChangeLog
index be67de53d..c58345c41 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,6 +16,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
 - bug #2417058 [properties] Edit fields: losing auto-increment setting 
 - patch #2444082 [changelog] changelog.php linkifies one link wrong,
   thanks to Robert Xiao - nneonneo
+- bug #2363653 [properties] Various problems with table structure 
 
 3.1.1.0 (2008-12-09)
 - patch #2242765 [core] Navi panel server links wrong,
diff --git a/libraries/tbl_properties.inc.php b/libraries/tbl_properties.inc.php
index c3db5a641..4a430707f 100644
--- a/libraries/tbl_properties.inc.php
+++ b/libraries/tbl_properties.inc.php
@@ -174,7 +174,8 @@ for ($i = 0; $i < $num_fields; $i++) {
             $row['Key'] = '';
         }
 
-        $row['DefaultType']  = (isset($_REQUEST['field_default_type'][$i]) ? $_REQUEST['field_default_type'][$i] : 'USER_DEFINED');
+        // put None in the drop-down for Default, when someone adds a field 
+        $row['DefaultType']  = (isset($_REQUEST['field_default_type'][$i]) ? $_REQUEST['field_default_type'][$i] : 'NONE');
         $row['DefaultValue'] = (isset($_REQUEST['field_default_value'][$i]) ? $_REQUEST['field_default_value'][$i] : '');
 
         switch ($row['DefaultType']) {