fixing password reset...
fix logout redirect
just moving code around
fix reset password