Clean up the password dialog

We now assume it's only going to prompt for one password at a time,
which simplifies things a great deal.