Change email modal and change password Modal

**READY TO MERGE** Depends on [this pr](https://github.com/balanced/injustice/pull/67)

Fixes #1081
Also fixes #801