fix continous re-registration issue