Fix to passphrase dialog and Issue #207