Added clear login fixes