Ask for password on failed decryption
Merge pull request #3060 from saebekassebil/fixpassword

Ask for password on failed decryption