Reset password and misc fixed