fixed bug
cleaning up email change code