Move user activation creation to when the user is added