fixup user_store usage drop