Fixed state changes out of profile page
See previous