Logout & URL Defensive Code added