Updated ValidatePwdCommand