diff --git a/migrations/d5_user.yml b/migrations/d5_user.yml
index c535721fa4d46ca18e2355de274329b3d37751e6..0e00a61aa99ff593d793ab80db9431441d7d89a0 100644
--- a/migrations/d5_user.yml
+++ b/migrations/d5_user.yml
@@ -19,13 +19,15 @@ process:
   preferred_langcode: language
   init: init
   roles:
-    plugin: migration
+    plugin: migration_lookup
     migration: d5_user_role
     source: roles
   user_picture:
     # Same for D5 and D6.
-    plugin: d6_user_picture
+    plugin: migration_lookup
+    migration: d6_user_picture_file
     source: uid
+    no_stub: true
 destination:
   plugin: entity:user
   md5_passwords: true