ZEN-8272: Custom IP Service can't be saved under some circumstances on c...

...lean