nanny: Fix config origin
client: Make persistent switch working with nanny