diff --git a/core/includes/install.core.inc b/core/includes/install.core.inc
index cf8f1ed..0856cd1 100644
--- a/core/includes/install.core.inc
+++ b/core/includes/install.core.inc
@@ -1496,6 +1496,11 @@ function install_import_translations(&$install_state) {
     language_save($language);
   }
 
+  // If a non-english language was selected, remove English.
+  if ($langcode != 'en') {
+    language_delete('en');
+  }
+
   // Collect files to import for this language.
   $batch = locale_translate_batch_import_files(array('langcode' => $langcode));
   if (!empty($batch)) {
diff --git a/core/modules/language/language.admin.inc b/core/modules/language/language.admin.inc
index a601d00..759705d 100644
--- a/core/modules/language/language.admin.inc
+++ b/core/modules/language/language.admin.inc
@@ -698,7 +698,11 @@ function language_negotiation_configure_url_form($form, &$form_state) {
   foreach ($languages as $langcode => $language) {
     $form['prefix'][$langcode] = array(
       '#type' => 'textfield',
-      '#title' => t('%language (%langcode) path prefix', array('%language' => $language->name, '%langcode' => $language->langcode)),
+      '#title' => t('%language (%langcode) path prefix%default_indicator', array(
+        '%language' => $language->name,
+        '%langcode' => $language->langcode,
+        '%default_indicator' => (($language->default) ? ' (' . t('Default language') . ')' : NULL),
+      )),
       '#maxlength' => 64,
       '#default_value' => isset($prefixes[$langcode]) ? $prefixes[$langcode] : '',
       '#field_prefix' => $base_url . '/',
diff --git a/core/modules/language/language.module b/core/modules/language/language.module
index cd4ebb7..c4923b0 100644
--- a/core/modules/language/language.module
+++ b/core/modules/language/language.module
@@ -244,7 +244,8 @@ function language_save($language) {
   // Kill the static cache in language_list().
   drupal_static_reset('language_list');
 
-  // Update URL Prefixes for all languages.
+  // Update URL Prefixes for all languages after the new default language is
+  // propagated and the language_list cache is flushed.
   language_negotiation_url_prefixes_update();
 
   return $language;