diff -u b/core/modules/user/migration_templates/d7_user.yml b/core/modules/user/migration_templates/d7_user.yml
--- b/core/modules/user/migration_templates/d7_user.yml
+++ b/core/modules/user/migration_templates/d7_user.yml
@@ -1,9 +1,8 @@
 id: d7_user
 label: User accounts
-class: '\Drupal\migrate\Plugin\IdAuditingMigration'
 migration_tags:
   - Drupal 7
-class: Drupal\user\Plugin\migrate\User
+class: '\Drupal\user\Plugin\migrate\User'
 source:
   plugin: d7_user
 process:
only in patch2:
unchanged:
--- a/core/modules/migrate_drupal/src/Plugin/migrate/FieldMigration.php
+++ b/core/modules/migrate_drupal/src/Plugin/migrate/FieldMigration.php
@@ -5,6 +5,7 @@
 use Drupal\Component\Plugin\Exception\PluginNotFoundException;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
 use Drupal\migrate\Exception\RequirementsException;
+use Drupal\migrate\Plugin\IdAuditingMigration;
 use Drupal\migrate\Plugin\MigrateDestinationPluginManager;
 use Drupal\migrate\Plugin\MigratePluginManager;
 use Drupal\migrate\Plugin\Migration;
@@ -17,7 +18,7 @@
 /**
  * Migration plugin class for migrations dealing with field config and values.
  */
-class FieldMigration extends Migration implements ContainerFactoryPluginInterface {
+class FieldMigration extends IdAuditingMigration implements ContainerFactoryPluginInterface {
 
   /**
    * Defines which configuration option has the migration processing function.