ManagementService register/unregister fixes #683