Applying simpler check on page load

Signed-off-by: Jean Bordat <bordat.jean@gmail.com>