Refactor: Use `Config.origindomain` in two more places