diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_user_profile_entity_form_display.yml b/core/modules/migrate_drupal/config/install/migrate.migration.d6_user_profile_entity_form_display.yml
index c74b37f..9d84b4c 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_user_profile_entity_form_display.yml
+++ b/core/modules/migrate_drupal/config/install/migrate.migration.d6_user_profile_entity_form_display.yml
@@ -18,7 +18,7 @@ process:
     plugin: static_map
     source: type
     map:
-      checkbox: options_select
+      checkbox: options_onoff
       date: datetime_default
       list: text_textfield
       selection: options_select
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_user_profile_field.yml b/core/modules/migrate_drupal/config/install/migrate.migration.d6_user_profile_field.yml
index fb9217c..183a265 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_user_profile_field.yml
+++ b/core/modules/migrate_drupal/config/install/migrate.migration.d6_user_profile_field.yml
@@ -11,7 +11,7 @@ process:
     plugin: static_map
     source: type
     map:
-      checkbox: list_integer
+      checkbox: list_boolean
       date: datetime
       list: text
       selection: list_text
diff --git a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/process/d6/FieldInstanceWidgetSettings.php b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/process/d6/FieldInstanceWidgetSettings.php
index 4ec140e..d701dfd 100644
--- a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/process/d6/FieldInstanceWidgetSettings.php
+++ b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/process/d6/FieldInstanceWidgetSettings.php
@@ -45,6 +45,7 @@ public function getSettings($widget_type, $widget_settings) {
     $progress = isset($widget_settings['progress_indicator']) ? $widget_settings['progress_indicator'] : 'throbber';
     $size = isset($widget_settings['size']) ? $widget_settings['size'] : 60;
     $rows = isset($widget_settings['rows']) ? $widget_settings['rows'] : 5;
+    $display_label = isset($widget_settings['display_label']) ? $widget_settings['display_label']: FALSE;
 
     $settings = array(
       'text_textfield' => array(
@@ -73,7 +74,7 @@ public function getSettings($widget_type, $widget_settings) {
         'preview_image_style' => 'thumbnail',
       ),
       'optionwidgets_onoff' => array(
-        'display_label' => FALSE,
+        'display_label' => $display_label,
       ),
       'phone_textfield' => array(
         'placeholder' => '',
diff --git a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/Dump/Drupal6UserProfileFields.php b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/Dump/Drupal6UserProfileFields.php
index 3d3d017..b1d4e73 100644
--- a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/Dump/Drupal6UserProfileFields.php
+++ b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/Dump/Drupal6UserProfileFields.php
@@ -235,6 +235,21 @@ public static function getData($table) {
           'autocomplete' => '0',
           'options' => '',
         ),
+        array(
+          'fid' => '15',
+          'title' => 'I love migrations',
+          'name' => 'profile_love_migrations',
+          'explanation' => "If you check this box, you love migrations.",
+          'category' => 'Personal information',
+          'page' => 'People who love migrations',
+          'type' => 'checkbox',
+          'weight' => '-15',
+          'required' => '0',
+          'register' => '0',
+          'visibility' => '2',
+          'autocomplete' => '0',
+          'options' => '',
+        ),
       ),
     );
 
diff --git a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/d6/MigrateUserProfileEntityFormDisplayTest.php b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/d6/MigrateUserProfileEntityFormDisplayTest.php
index 40257e9..947b662 100644
--- a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/d6/MigrateUserProfileEntityFormDisplayTest.php
+++ b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/d6/MigrateUserProfileEntityFormDisplayTest.php
@@ -49,7 +49,7 @@ protected function setUp() {
     entity_create('field_config', array(
       'entity_type' => 'user',
       'name' => 'profile_sell_address',
-      'type' => 'list_integer',
+      'type' => 'list_boolean',
     ))->save();
     entity_create('field_config', array(
       'entity_type' => 'user',
@@ -72,6 +72,11 @@ protected function setUp() {
       'name' => 'profile_birthdate',
       'type' => 'datetime',
     ))->save();
+    entity_create('field_config', array(
+      'entity_type' => 'user',
+      'name' => 'profile_love_migrations',
+      'type' => 'list_boolean',
+    ))->save();
     $field_data = Drupal6UserProfileFields::getData('profile_fields');
     foreach ($field_data as $field) {
       entity_create('field_instance_config', array(
@@ -116,6 +121,11 @@ public function testUserProfileEntityFormDisplay() {
 
     // Test PROFILE_HIDDEN field is hidden.
     $this->assertNull($display->getComponent('profile_sold_to'));
+
+    // Test that a checkbox field has the proper display label setting.
+    $component = $display->getComponent('profile_love_migrations');
+    $this->assertEqual($component['type'], 'options_onoff');
+    $this->assertEqual($component['settings']['display_label'], true);
   }
 
 }
diff --git a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/d6/MigrateUserProfileFieldInstanceTest.php b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/d6/MigrateUserProfileFieldInstanceTest.php
index 7393fea..dfb05e4 100644
--- a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/d6/MigrateUserProfileFieldInstanceTest.php
+++ b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/d6/MigrateUserProfileFieldInstanceTest.php
@@ -101,7 +101,7 @@ protected function createFields() {
     $fields = array(
       'profile_color' => 'text',
       'profile_biography' => 'text_long',
-      'profile_sell_address' => 'list_integer',
+      'profile_sell_address' => 'list_boolean',
       'profile_sold_to' => 'list_text',
       'profile_bands' => 'text',
       'profile_blog' => 'link',
diff --git a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/d6/MigrateUserProfileFieldTest.php b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/d6/MigrateUserProfileFieldTest.php
index 696695c..69af4a0 100644
--- a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/d6/MigrateUserProfileFieldTest.php
+++ b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/d6/MigrateUserProfileFieldTest.php
@@ -58,7 +58,7 @@ public function testUserProfileFields() {
 
     // Migrated checkbox field.
     $field = entity_load('field_config', 'user.profile_sell_address');
-    $this->assertEqual($field->type, 'list_integer', 'Field type is list_integer.');
+    $this->assertEqual($field->type, 'list_boolean', 'Field type is list_boolean.');
 
     // Migrated selection field.
     $field = entity_load('field_config', 'user.profile_sold_to');