add support for changing email & updating token