diff --git a/ChangeLog b/ChangeLog
index 85d7ecf44..e59b5c4c4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -25,6 +25,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
 + [lang] Dutch update, thanks to Herman van Rink - helmo 
 - patch #2407785 [cleanup] ereg*() deprecated in PHP 5.3,
   thanks to Alex Frase - atfrase
+- bug #2417058 [properties] Edit fields: losing auto-increment setting
 
 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 ff8ad78b8..3bbf0e41c 100644
--- a/libraries/tbl_properties.inc.php
+++ b/libraries/tbl_properties.inc.php
@@ -530,7 +530,7 @@ for ($i = 0; $i < $num_fields; $i++) {
     $content_cells[$i][$ci] = '<input name="field_extra[' . $i . ']"'
         . ' id="field_' . $i . '_' . ($ci - $ci_offset) . '"';
 
-    if (isset($row['Extra']) && $row['Extra'] == 'auto_increment') {
+    if (isset($row['Extra']) && strtolower($row['Extra']) == 'auto_increment') {
         $content_cells[$i][$ci] .= ' checked="checked"';
     }