Switched order on subscriber registration so we tag the user no matter what.