diff --git a/ChangeLog b/ChangeLog
index c14b64db7..7c91688a9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
 - bug [display] Incorrect display in replication status, 
   thanks to Tomas Srnka - tomassrnka
 - bug #1601625 [display] The Ignore checkbox is not unchecked for ENUM 
+- bug #2809930 [setup] Notice: Undefined variable: k in setup/index.php
 
 3.2.0.0 (2009-06-15)
 - [core] better support for vendor customisation (based on what Debian needs)
diff --git a/setup/lib/ConfigFile.class.php b/setup/lib/ConfigFile.class.php
index a7db0155c..c0ff63daf 100644
--- a/setup/lib/ConfigFile.class.php
+++ b/setup/lib/ConfigFile.class.php
@@ -286,10 +286,10 @@ class ConfigFile
         if ($this->getServerCount() > 0) {
             $ret .= "/* Servers configuration */$crlf\$i = 0;" . $crlf . $crlf;
             foreach ($c['Servers'] as $id => $server) {
-                $k = preg_replace('/[^A-Za-z0-9_]/', '_', $k);
                 $ret .= '/* Server: ' . strtr($this->getServerName($id), '*/', '-') . " [$id] */" . $crlf
                     . '$i++;' . $crlf;
                 foreach ($server as $k => $v) {
+                    $k = preg_replace('/[^A-Za-z0-9_]/', '_', $k);
                     $ret .= "\$cfg['Servers'][\$i]['$k'] = "
                         . var_export($v, true) . ';' . $crlf;
                 }