am fb992696: am 35c53a5e: Merge change 25436 into eclair

Merge commit 'fb992696b94579f8f9aa1afc81fe0e6d503f838e'

* commit 'fb992696b94579f8f9aa1afc81fe0e6d503f838e':
  set the email validator in all cases, to make sure guest email addresses are validated.