LIVEOAK-342: Fix scope mapping when creating new client.