Changed the way the avatar is rendered and replaced e-mail address with
e-mail.