Rename email->email_address to remove ambiguity