Melanie/Pooja | #0000 | Fixing on behalf of daatsender when datasender logs in