Support login/logout in redesign