diff --git a/core/modules/user/src/Plugin/migrate/builder/d7/User.php b/core/modules/user/src/Plugin/migrate/builder/d7/User.php
index 10bcb47..f680741 100644
--- a/core/modules/user/src/Plugin/migrate/builder/d7/User.php
+++ b/core/modules/user/src/Plugin/migrate/builder/d7/User.php
@@ -11,13 +11,14 @@
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
 use Drupal\migrate\Entity\Migration;
 use Drupal\migrate\Exception\RequirementsException;
-use Drupal\migrate\Plugin\migrate\builder\BuilderBase;
+use Drupal\migrate\Plugin\MigratePluginManager;
+use Drupal\migrate_drupal\Plugin\migrate\builder\CckBuilder;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
  * @PluginID("d7_user")
  */
-class User extends BuilderBase implements ContainerFactoryPluginInterface {
+class User extends CckBuilder implements ContainerFactoryPluginInterface {
 
   /**
    * The module handler service.
@@ -35,11 +36,13 @@ class User extends BuilderBase implements ContainerFactoryPluginInterface {
    *   The plugin ID.
    * @param mixed $plugin_definition
    *   The plugin definition.
+   * @param \Drupal\migrate\Plugin\MigratePluginManager $cck_manager
+   *   The cckfield plugin manager.
    * @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler
    *   The module handler service.
    */
-  public function __construct(array $configuration, $plugin_id, $plugin_definition, ModuleHandlerInterface $module_handler) {
-    parent::__construct($configuration, $plugin_id, $plugin_definition);
+  public function __construct(array $configuration, $plugin_id, $plugin_definition, MigratePluginManager $cck_manager, ModuleHandlerInterface $module_handler) {
+    parent::__construct($configuration, $plugin_id, $plugin_definition, $cck_manager);
     $this->moduleHandler = $module_handler;
   }
 
@@ -51,6 +54,7 @@ public static function create(ContainerInterface $container, array $configuratio
       $configuration,
       $plugin_id,
       $plugin_definition,
+      $container->get('plugin.manager.migrate.cckfield'),
       $container->get('module_handler')
     );
   }
@@ -67,7 +71,14 @@ public function buildMigrations(array $template) {
       $source_plugin = $this->getSourcePlugin('d7_field_instance', $template['source']);
       foreach ($source_plugin as $field) {
         $field_name = $field->getSourceProperty('field_name');
-        $migration->setProcessOfProperty($field_name, $field_name);
+        $type = $field->getSourceProperty('type');
+        if ($this->cckPluginManager->hasDefinition($type)) {
+          $this->getCckPlugin($type)
+            ->processCckFieldValues($migration, $field_name, $field->getSource());
+        }
+        else {
+          $migration->setProcessOfProperty($field_name, $field_name);
+        }
       }
     }