Fix issue in previous commit regarding persistency of bundle mode account settings.