updated label control rows for Passport on issue #1018