Addresses authentication issues related to -Credential flow