Fix mask/unmask password issues