LPS-42823 + LPS-42824

Hi @samuelkong 

here are 2 issues, they are in the same portlet, but with different severity => one pull with 2 commits/tickets :)

Thanks.