Maybe out of scope for this ticket, but I'd really like to get rid of `unique_identifier` and replace it with `company_login`, since that seems to be all it ever refers to.