--- ./main.bak	2005-10-22 15:48:14.000000000 +0200
+++ ./main.inc	2005-10-23 05:40:48.000000000 +0200
@@ -283,6 +283,9 @@
     return FALSE;
 
   // user already registered
+  $default_language = explode ("_", $CONFIG['locale_string']);
+  $default_language = $default_language[0];
+
   if ($user_id && !empty($sql_arr))
     {
     // get user prefs
@@ -293,10 +296,13 @@
       array_merge($CONFIG, $user_prefs);
       }
 
+
     // set user specific language
     if (strlen($sql_arr['language']))
       $sess_user_lang = $_SESSION['user_lang'] = $sql_arr['language'];
-    
+    else
+      $sess_user_lang = $default_language;
+      
     // update user's record
     $DB->query(sprintf("UPDATE %s
                         SET    last_login=NOW()
@@ -317,6 +323,7 @@
     $_SESSION['imap_port'] = $imap_port;
     $_SESSION['imap_ssl']  = $imap_ssl;
     $_SESSION['username']  = $user;
+    $_SESSION['user_lang']  = $default_language;
     $_SESSION['password']  = encrypt_passwd($pass);
 
     // force reloading complete list of subscribed mailboxes    
@@ -334,12 +341,16 @@
   {
   global $DB, $CONFIG, $IMAP;
 
+  $default_language = explode ("_", $CONFIG['locale_string']);
+  $default_language = $default_language[0];
+  
   $DB->query(sprintf("INSERT INTO %s
-                      (created, last_login, username, mail_host)
-                      VALUES (NOW(), NOW(), '%s', '%s')",
+                      (created, last_login, username, mail_host, language)
+                      VALUES (NOW(), NOW(), '%s', '%s', '%s')",
                      get_table_name('users'),
                      addslashes($user),
-                     addslashes($host)));
+                     addslashes($host),
+		     addslashes($default_language)));
 
   if ($user_id = $DB->insert_id())
     {