Reworked the get-tentative-registration service