Change logic for associating EIPs when not given