Potential Logout Fix?