diff --git a/CHANGELOG b/CHANGELOG
index 95c79ffb9..0b1665771 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -27,6 +27,7 @@ CHANGELOG Roundcube Webmail
 - Fix handling of body parameter in mail compose request
 - Protect download urls against CSRF using unique request tokens (#1490642)
 - newmail_notifier: Refactor desktop notifications
+- Fix so contactlist_fields option can be set via config file
 
 RELEASE 1.2-beta
 ----------------
diff --git a/config/defaults.inc.php b/config/defaults.inc.php
index 4339523e9..a482e2826 100644
--- a/config/defaults.inc.php
+++ b/config/defaults.inc.php
@@ -989,6 +989,10 @@ $config['address_template'] = '{street}<br/>{locality} {zipcode}<br/>{country} {
 // Note: For LDAP sources fuzzy_search must be enabled to use 'partial' or 'prefix' mode
 $config['addressbook_search_mode'] = 0;
 
+// List of fields used on contacts list and for autocompletion searches
+// Warning: These are field names not LDAP attributes (see 'fieldmap' setting)!
+$config['contactlist_fields'] = array('name', 'firstname', 'surname', 'email');
+
 // Template of contact entry on the autocompletion list.
 // You can use contact fields as: name, email, organization, department, etc.
 // See program/steps/addressbook/func.inc for a list
diff --git a/program/lib/Roundcube/rcube_config.php b/program/lib/Roundcube/rcube_config.php
index a58af3753..eac5f12de 100644
--- a/program/lib/Roundcube/rcube_config.php
+++ b/program/lib/Roundcube/rcube_config.php
@@ -87,9 +87,10 @@ class rcube_config
         $this->load();
 
         // Defaults, that we do not require you to configure,
-        // but contain information that is used in various
-        // locations in the code:
-        $this->set('contactlist_fields', array('name', 'firstname', 'surname', 'email'));
+        // but contain information that is used in various locations in the code:
+        if (empty($this->prop['contactlist_fields'])) {
+            $this->set('contactlist_fields', array('name', 'firstname', 'surname', 'email'));
+        }
     }
 
     /**