Fixed userStore problems