Switch to pbkdf2_bin
Remove number insertion.