Hardened back navigation support
Continued hardening of logout / Back navigation via buttons