Updated for redirect fix and shibboleth