Added support for existing authenticated clients.