Fix service account retrieve call
REF T183