Move activation to pre-register