Add back password decryption (regression fix)