889573: Only persist serverurl and baseurl when registering.