Improved handling for multiple authentication