eDrive: Properly user Id to fetch aliases and also use email for email

2 jobs for 5682-v1-oreo-aliases_id in 3 minutes and 13 seconds (queued for 2 seconds)