updated for email_address unique constraint