Bug fixes with multiple authentication

Bug fixes with multiple authentication