Making sure we normalise the email address consistently in the various different places.

touch #49.