Mask pwd fix