Fix configuration options being cleared on restart