BAP-196 - override credentials