[*] BO : Fix #HOSTED-581, fixes for unstrusted modal (see: #PSCSX-3245)