User state

User state is now correctly persisted