Make setup page usable from shibboleth

Second patch to address #2607