Quote state labels changed
Authentication refactored