Use User.userId instead of User.id
Merge branch 'bugs/avatars-missing-59684850' into development