More fixes : still problems with logout()