Fixed main error.
Fixed pw-validation on modal.