Rearranged some of the logic when updating from legacy options
Updated the changelog