diff -u b/core/modules/user/user.install b/core/modules/user/user.install
--- b/core/modules/user/user.install
+++ b/core/modules/user/user.install
@@ -395,7 +395,7 @@
  * Create user picture field.
  */
 function user_update_8002() {
-  user_create_picture_field();
+  _user_install_picture_field();
 }
 
 /**
@@ -424,7 +424,7 @@
 /**
  * Creates a "User picture" image field for the User entity.
  */
-function user_create_picture_field() {
+function _user_install_picture_field() {
   $field = array(
     'field_name' => 'field_user_picture',
     'module' => 'image',
@@ -446,18 +446,19 @@
   $instance = array(
     'field_name' => 'field_user_picture',
     'entity_type' => 'user',
-    'label' => 'User Picture',
+    'label' => 'Picture',
     'bundle' => 'user',
-    'description' => st('Upload an image to go with this user account.'),
+    'description' => st('Your virtual face or picture.'),
     'required' => FALSE,
     'settings' => array(
-      'file_directory' => 'pictures',
       'file_extensions' => 'png gif jpg jpeg',
+      'file_directory' => 'pictures',
       'max_filesize' => '',
+      'alt_field' => 0,
+      'title_field' => 0,
       'max_resolution' => '',
       'min_resolution' => '',
-      'alt_field' => 'User picture',
-      'title_field' => '',
+      'default_image' => 0,
     ),
     'widget' => array(
       'module' => 'image',
diff -u b/core/modules/user/user.test b/core/modules/user/user.test
--- b/core/modules/user/user.test
+++ b/core/modules/user/user.test
@@ -945,7 +945,7 @@
 
     // @see standard.install
     module_load_install('user');
-    user_create_picture_field();
+    _user_install_picture_field();
 
     // Remove 'summary' pseudo-field from compact view mode on the User entity.
     $bundle_settings = field_bundle_settings('user', 'user');
diff -u b/profiles/standard/standard.install b/profiles/standard/standard.install
--- b/profiles/standard/standard.install
+++ b/profiles/standard/standard.install
@@ -396,9 +396,9 @@
   );
   field_create_instance($instance);
 
+  // Create user picture field.
   module_load_install('user');
-  user_create_picture_field();
-
+  _user_install_picture_field();
   // Remove 'summary' pseudo-field from compact view mode on the User entity.
   $bundle_settings = field_bundle_settings('user', 'user');
   $bundle_settings['extra_fields']['display']['member_for']['compact'] = array(
only in patch2:
unchanged:
--- a/core/modules/field/modules/field_sql_storage/field_sql_storage.install
+++ b/core/modules/field/modules/field_sql_storage/field_sql_storage.install
@@ -118,11 +118,15 @@ function field_sql_storage_update_8000(&$sandbox) {
     $table_info = array($data_table => $primary_key_data, $revision_table => $primary_key_revision);
 
     foreach ($table_info as $table => $primary_key) {
-      db_drop_primary_key($table);
-      db_drop_index($table, 'language');
-      db_change_field($table, 'language', 'langcode', $field_langcode);
-      db_add_primary_key($table, $primary_key);
-      db_add_index($table, 'langcode', $langcode_index);
+      // Do not attempt to rename the 'language' column for fields that already
+      // contain it (created during the upgrade before this update function).
+      if (db_field_exists($table, 'language')) {
+        db_drop_primary_key($table);
+        db_drop_index($table, 'language');
+        db_change_field($table, 'language', 'langcode', $field_langcode);
+        db_add_primary_key($table, $primary_key);
+        db_add_index($table, 'langcode', $langcode_index);
+      }
     }
   }
 }