Fix Issue: Logout will leaver LS data intact.
Finish fixing issue.