diff --git a/core/modules/user/src/Plugin/migrate/source/d7/User.php b/core/modules/user/src/Plugin/migrate/source/d7/User.php
index 9b42fa7..fc05bf3 100755
--- a/core/modules/user/src/Plugin/migrate/source/d7/User.php
+++ b/core/modules/user/src/Plugin/migrate/source/d7/User.php
@@ -66,11 +66,12 @@ public function fields() {
    * {@inheritdoc}
    */
   public function prepareRow(Row $row) {
-    $roles = $this->select('role', 'r')
-      ->fields('r', ['rid', 'name']);
-    $roles->join('users_roles', 'ur', 'ur.rid = r.rid');
-    $roles->condition('ur.uid', $row->getSourceProperty('uid'));
-    $row->setSourceProperty('roles', $roles->execute()->fetchAllKeyed());
+    $roles = $this->select('users_roles', 'ur')
+      ->fields('ur', ['rid'])
+      ->condition('ur.uid', $row->getSourceProperty('uid'))
+      ->execute()
+      ->fetchCol();
+    $row->setSourceProperty('roles', $roles);
 
     $row->setSourceProperty('data', unserialize($row->getSourceProperty('data')));
 
diff --git a/core/modules/user/tests/src/Unit/Plugin/migrate/source/d7/UserTest.php b/core/modules/user/tests/src/Unit/Plugin/migrate/source/d7/UserTest.php
index c7e35e1..1e47144 100644
--- a/core/modules/user/tests/src/Unit/Plugin/migrate/source/d7/UserTest.php
+++ b/core/modules/user/tests/src/Unit/Plugin/migrate/source/d7/UserTest.php
@@ -41,9 +41,7 @@ class UserTest extends MigrateSqlSourceTestCase {
       'language' => '',
       'picture' => '0',
       'init' => 'odo@local.host',
-      'roles' => [
-        2 => 'authenticated user',
-      ],
+      'roles' => [2],
       'data' => [
         'contact' => 1,
       ],