fix: account for revoked licenses and staff users in auto-apply logic

fix: account for revoked licenses and staff users in auto-apply logic #2645