Use canonical account path rather then protocol/name pair