--- C:/Documents and Settings/User/Desktop/locale.module	Wed Feb 25 18:47:37 2009
+++ D:/wamp/apps/drupal-6.12/modules/locale/locale.module	Thu May 21 15:03:40 2009
@@ -271,10 +271,11 @@
     default:
       if (isset($form['#id']) && $form['#id'] == 'node-form') {
         if (isset($form['#node']->type) && variable_get('language_content_type_'. $form['#node']->type, 0)) {
+          global $language;
           $form['language'] = array(
             '#type' => 'select',
             '#title' => t('Language'),
-            '#default_value' => (isset($form['#node']->language) ? $form['#node']->language : ''),
+            '#default_value' => (!empty($form['#node']->language) ? $form['#node']->language : $language->language),
             '#options' => array('' => t('Language neutral')) + locale_language_list('name'),
           );
         }