Service2 wiring, change to SamlToken policy