#536 replace password validation