Fix reencrypting blank fields