Use profile id instead of UA code [Finishes #84202330]