Added fix for missing email field