Decrypt part two

patches related to password decryption support