GTNPORTAL-2973: More reliable fix, using a4j and oncomplete.