...
A bunch of unralated changes
fixed email reset