One more password confirmation fix

Apologies for multiple pull requests!