Minor cleanup for menus on login and logout (they should disappear altogether)