Ensure that a user always gets a key on save