Added the possibility to collect different user information for each type of authentication. This is a preparation step to add AA as backend for the proxy.