diff --git a/devel_generate/devel_generate.drush.inc b/devel_generate/devel_generate.drush.inc
index 67ca8f6..f90a57a 100644
--- a/devel_generate/devel_generate.drush.inc
+++ b/devel_generate/devel_generate.drush.inc
@@ -136,7 +136,7 @@ function drush_devel_generate_content($num_nodes = NULL, $max_comments = NULL) {
     $add_language = explode(',', str_replace(' ', '', $add_language));
     // Intersect with the enabled languages to make sure the language args
     // passed are actually enabled.
-    $values['values']['add_language'] = array_flip(array_intersect($add_language, array_keys(locale_language_list())));
+    $values['values']['add_language'] = array_intersect($add_language, array_keys(locale_language_list()));
   }
 
   // Load user 1; is needed for creating *published* comments.
diff --git a/devel_generate/devel_generate.inc b/devel_generate/devel_generate.inc
index bb0358e..2b35528 100644
--- a/devel_generate/devel_generate.inc
+++ b/devel_generate/devel_generate.inc
@@ -699,7 +699,7 @@ function devel_generate_content_add_node(&$results) {
  */
 function devel_generate_set_language($results, $object) {
   if (isset($results['add_language'])) {
-    $languages = array_keys($results['add_language']);
+    $languages = $results['add_language'];
     $object->language = $languages[array_rand($languages)];
   }
   else {
diff --git a/devel_generate/devel_generate.module b/devel_generate/devel_generate.module
index 07e1844..3f3b511 100644
--- a/devel_generate/devel_generate.module
+++ b/devel_generate/devel_generate.module
@@ -197,7 +197,7 @@ function devel_generate_content_form() {
     '#disabled' => !module_exists('locale'),
     '#description' => t('Requires locale.module'),
     '#options' => $options,
-    '#default_value' => array(LANGUAGE_NONE => LANGUAGE_NONE),
+    '#default_value' => array(LANGUAGE_NONE),
   );
 
   $form['submit'] = array(