Add email validation, use defaults object