[#52753517] Minor refactor of data source account