Tweak to use user's email instead of my test address