Added support for nullable emails