#4986 using password check