*** ../../leads1_local/includes/language.inc.orig       Mon May 17 00:58:28 2010
--- language.inc        Sat Jun 19 16:25:41 2010
***************
*** 20,26 ****

    switch ($mode) {
      case LANGUAGE_NEGOTIATION_NONE:
!       return language_default();

      case LANGUAGE_NEGOTIATION_DOMAIN:
        foreach ($languages as $language) {
--- 20,30 ----

    switch ($mode) {
      case LANGUAGE_NEGOTIATION_NONE:
!       if ($user->uid && isset($languages[$user->language])) {
!         return $languages[$user->language];
!       }
!       else
!         return language_default();

      case LANGUAGE_NEGOTIATION_DOMAIN:
        foreach ($languages as $language) {