Refactor
User activation changes