added e-mail addition (nearly)