Improve password deletion, avoid showing ghosts