merge liuqr's password strength and modified