Refactored the logout notifications