Added support for changing email address