[DO NOT MERGE] Populate user email address on auth