Make some improvements to handle Calendar removal/Creation and timezone computing
Handle logout in LoginModule