Replace user.id with user.email [MJ-473]