Added email saving to account. Other changes.