diff --git a/ChangeLog b/ChangeLog
index 9d67091161..2220be0b25 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -17,6 +17,7 @@ phpMyAdmin - ChangeLog
 - bug       Undefined index notices while configuring recent and favorite tables
 - bug #4687 Designer breaks without configuration storage
 - bug #4686 Select elements flicker and selects something else
+- bug #4689 Setup tool creates "pma__favorites" incorrectly
 
 4.3.5.0 (2015-01-05)
 - bug       Auto-configuration: tables were not created automatically
diff --git a/libraries/config/setup.forms.php b/libraries/config/setup.forms.php
index 68b409efb7..8c285f8d53 100644
--- a/libraries/config/setup.forms.php
+++ b/libraries/config/setup.forms.php
@@ -75,7 +75,7 @@ $forms['Servers']['Server_pmadb'] = array('Servers' => array(1 => array(
     'column_info' => 'pma__column_info',
     'history' => 'pma__history',
     'recent' => 'pma__recent',
-    'favorite' => 'pma_favorite',
+    'favorite' => 'pma__favorite',
     'table_uiprefs' => 'pma__table_uiprefs',
     'tracking' => 'pma__tracking',
     'table_coords' => 'pma__table_coords',