fixed email field names