TRUNK-2498: Validate email address in user options page fixed, formatting issue corrected