P2 "secure" HTH was missed a bit

Cleanup made, reusing the "non-secure" to be sure
we mount the same stuff, and are adding only securty
bits