OOIION-1660 Adds re-registration process R2