Yet another reason to switch to SSH keys instead of passwords wherever possible. Simple and bulletproof, with a minimum of footguns.

EDIT: @tedunangst is right, wouldn't have helped. Even so, switch to keys!