Fix user state save