Fix for leaked account info in settings