Index: includes/locale.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/locale.inc,v
retrieving revision 1.151
diff -u -F^f -r1.151 locale.inc
--- includes/locale.inc	12 Aug 2007 15:55:35 -0000	1.151
+++ includes/locale.inc	13 Aug 2007 04:04:58 -0000
@@ -97,9 +97,10 @@ function theme_locale_languages_overview
  */
 function locale_languages_overview_form_submit($form, &$form_state) {
   $languages = language_list();
+  $default = language_default();
   $enabled_count = 0;
   foreach ($languages as $langcode => $language) {
-    if ($form_state['values']['site_default'] == $langcode) {
+    if ($form_state['values']['site_default'] == $langcode || $default->language == $langcode) {
       // Automatically enable the default language.
       $form_state['values']['enabled'][$langcode] = 1;
     }
@@ -918,7 +919,9 @@ function locale_add_language($langcode, 
   }
 
   // Increment count of enabled languages.
-  variable_set('language_count', variable_get('language_count', 1) + 1);
+  if ($enabled) {
+    variable_set('language_count', variable_get('language_count', 1) + 1);
+  }
 
   watchdog('locale', 'The %language language (%code) has been created.', array('%language' => $name, '%code' => $langcode));
 }