Add not null db constraints
Use email_field for email