Calendar/UBO Authentication Updates