ACF-54: Restore token validation functionality