toggle updates for passport issue #1018