Refactor for lazy

Can this become an issue in case the save fails and we stick with the encrypted value around?