More reset fixes
Fixing password reset