Heri & Sophie | #2859 | Adding feeback from Ramya QA
Heri & Sophie | #2991 | Fixing some links are not clickable on activation email