diff --git a/CHANGELOG b/CHANGELOG
index 9137398ca..b109156dd 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,13 @@
 CHANGELOG RoundCube Webmail
 ---------------------------
 
+2008/09/23 (alec)
+----------
+- Fix language autodetection (#1485401)
+- Fix button label in folders management (#1485405)
+- Fix collapsed folder not indicating unread msgs count of all subfolders (#1485403)
+- Fix handling of apostrophes in filenames decoded according to rfc2231
+
 2008/09/19 (thomasb)
 ----------
 - Made config files location configurable (#1485215)
diff --git a/program/include/rcube_user.php b/program/include/rcube_user.php
index 97de97b37..8c77fdcf4 100644
--- a/program/include/rcube_user.php
+++ b/program/include/rcube_user.php
@@ -78,7 +78,8 @@ class rcube_user
    */
   function get_prefs()
   {
-    $prefs = array('language' => $this->language);
+    if (!empty($this->language))
+      $prefs = array('language' => $this->language);
     
     if ($this->ID && $this->data['preferences'])
       $prefs += (array)unserialize($this->data['preferences']);