Bug1397 - Use unique identifier for shibolleth