Merge "Pass the correct user id"