Refactored the activation mail so that the controller/service decoupling is done correctly