Fix520

Code Review: http://mrccodereview.cloudapp.net/ui#review:id=1272

This change enables saving a profile even when the email is not specified. If the email field is not empty, it will require a valid email and to agree to terms.