Refactored activation to confirmation