Fixes in logout and reset password