LPS-46821 SF
LPS-47262 pass the correct user to the DL services

Fix the previously reverted commit to make all tests pass.