Account settings: Set correct state icon right away