#999 Enable ability to disable First Run