Fix registrationId save which currently breaks unit tests