Minor code cleanup, possibly fixed passwords not decrypting occasionally