CLDCONNECT-1162: adding safeguard to prevent double registration