Re-added the user role switch in the head.jsp
Small reduction of code duplication
Removed the Provider and re-implemented the switching of IdP's