changed the way how E-mail address is stored