More support for secured services, Fixes #2